Skip to content

R
rsvp.js
Commit 71f121c1 authored by Stefan Penner's avatar Stefan Penner
Browse files
Options

cleanup RSVP.all

parent 8c11dcc8
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 105 deletions
browser/rsvp.js
View file @ 71f121c1
...@@ -39,7 +39,8 @@ define("rsvp/all", ...@@ -39,7 +39,8 @@ define("rsvp/all",
function all(promises) { function all(promises) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var results = [], remaining = promises.length; var results = [], remaining = promises.length,
promise;
if (remaining === 0) { if (remaining === 0) {
resolve([]); resolve([]);
...@@ -59,10 +60,12 @@ define("rsvp/all", ...@@ -59,10 +60,12 @@ define("rsvp/all",
} }
for (var i = 0; i < promises.length; i++) { for (var i = 0; i < promises.length; i++) {
if (promises[i] && typeof promises[i].then === 'function') { promise = promises[i];
promises[i].then(resolver(i), reject);
if (promise && typeof promise.then === 'function') {
promise.then(resolver(i), reject);
} else { } else {
resolveAll(i, promises[i]); resolveAll(i, promise);
} }
} }
}); });
...@@ -315,50 +318,7 @@ define("rsvp/hash", ...@@ -315,50 +318,7 @@ define("rsvp/hash",
__exports__.hash = hash; __exports__.hash = hash;
}); });
define("rsvp/node",
["rsvp/promise","rsvp/all","exports"],
function(__dependency1__, __dependency2__, __exports__) {
"use strict";
var Promise = __dependency1__.Promise;
var all = __dependency2__.all;
function makeNodeCallbackFor(resolve, reject) {
return function (error, value) {
if (error) {
reject(error);
} else if (arguments.length > 2) {
resolve(Array.prototype.slice.call(arguments, 1));
} else {
resolve(value);
}
};
}
function denodeify(nodeFunc) {
return function() {
var nodeArgs = Array.prototype.slice.call(arguments), resolve, reject;
var promise = new Promise(function(nodeResolve, nodeReject) {
resolve = nodeResolve;
reject = nodeReject;
});
all(nodeArgs).then(function(nodeArgs) {
nodeArgs.push(makeNodeCallbackFor(resolve, reject));
try {
nodeFunc.apply(this, nodeArgs);
} catch(e) {
reject(e);
}
});
return promise;
};
}
__exports__.denodeify = denodeify;
});
define("rsvp/promise", define("rsvp/promise",
["rsvp/config","rsvp/events","exports"], ["rsvp/config","rsvp/events","exports"],
...@@ -568,12 +528,12 @@ define("rsvp/resolve", ...@@ -568,12 +528,12 @@ define("rsvp/resolve",
return typeof x === "function" || (typeof x === "object" && x !== null); return typeof x === "function" || (typeof x === "object" && x !== null);
} }
function resolve(thenable){ function resolve(thenable) {
if (thenable instanceof Promise) { if (thenable instanceof Promise) {
return thenable; return thenable;
} }
var promise = new Promise(function(resolve, reject){ var promise = new Promise(function(resolve, reject) {
var then; var then;
try { try {
......
browser/rsvp.min.js
View file @ 71f121c1
(function(){var e,t;(function(){var r={},n={};e=function(e,t,n){r[e]={deps:t,callback:n}};t=function(e){if(n[e]){return n[e]}n[e]={};var i=r[e],o=i.deps,s=i.callback,f=[],c;for(var u=0,a=o.length;u<a;u++){if(o[u]==="exports"){f.push(c={})}else{f.push(t(o[u]))}}var l=s.apply(this,f);return n[e]=c||l}})();e("rsvp/all",["rsvp/promise","exports"],function(e,t){"use strict";var r=e.Promise;function n(e){return new r(function(t,r){var n=[],i=e.length;if(i===0){t([])}function o(e){return function(t){s(e,t)}}function s(e,r){n[e]=r;if(--i===0){t(n)}}for(var f=0;f<e.length;f++){if(e[f]&&typeof e[f].then==="function"){e[f].then(o(f),r)}else{s(f,e[f])}}})}t.all=n});e("rsvp/async",["exports"],function(e){"use strict";var t=typeof window!=="undefined"?window:{};var r=t.MutationObserver||t.WebKitMutationObserver;var n;if(typeof process!=="undefined"&&{}.toString.call(process)==="[object process]"){n=function(e,t){process.nextTick(function(){e.call(t)})}}else if(r){var i=[];var o=new r(function(){var e=i.slice();i=[];e.forEach(function(e){var t=e[0],r=e[1];t.call(r)})});var s=document.createElement("div");o.observe(s,{attributes:true});window.addEventListener("unload",function(){o.disconnect();o=null});n=function(e,t){i.push([e,t]);s.setAttribute("drainQueue","drainQueue")}}else{n=function(e,t){setTimeout(function(){e.call(t)},1)}}e.async=n});e("rsvp/config",["rsvp/async","exports"],function(e,t){"use strict";var r=e.async;var n={};n.async=r;t.config=n});e("rsvp/defer",["rsvp/promise","exports"],function(e,t){"use strict";var r=e.Promise;function n(){var e={};var t=new r(function(t,r){e.resolve=t;e.reject=r});e.promise=t;return e}t.defer=n});e("rsvp/events",["exports"],function(e){"use strict";var t=function(e,t){this.type=e;for(var r in t){if(!t.hasOwnProperty(r)){continue}this[r]=t[r]}};var r=function(e,t){for(var r=0,n=e.length;r<n;r++){if(e[r][0]===t){return r}}return-1};var n=function(e){var t=e._promiseCallbacks;if(!t){t=e._promiseCallbacks={}}return t};var i={mixin:function(e){e.on=this.on;e.off=this.off;e.trigger=this.trigger;return e},on:function(e,t,i){var o=n(this),s,f;e=e.split(/\s+/);i=i||this;while(f=e.shift()){s=o[f];if(!s){s=o[f]=[]}if(r(s,t)===-1){s.push([t,i])}}},off:function(e,t){var i=n(this),o,s,f;e=e.split(/\s+/);while(s=e.shift()){if(!t){i[s]=[];continue}o=i[s];f=r(o,t);if(f!==-1){o.splice(f,1)}}},trigger:function(e,r){var i=n(this),o,s,f,c,u;if(o=i[e]){for(var a=0;a<o.length;a++){s=o[a];f=s[0];c=s[1];if(typeof r!=="object"){r={detail:r}}u=new t(e,r);f.call(c,u)}}}};e.EventTarget=i});e("rsvp/hash",["rsvp/defer","exports"],function(e,t){"use strict";var r=e.defer;function n(e){var t=0;for(var r in e){t++}return t}function i(e){var t={},i=r(),o=n(e);if(o===0){i.resolve({})}var s=function(e){return function(t){f(e,t)}};var f=function(e,r){t[e]=r;if(--o===0){i.resolve(t)}};var c=function(e){i.reject(e)};for(var u in e){if(e[u]&&typeof e[u].then==="function"){e[u].then(s(u),c)}else{f(u,e[u])}}return i.promise}t.hash=i});e("rsvp/node",["rsvp/promise","rsvp/all","exports"],function(e,t,r){"use strict";var n=e.Promise;var i=t.all;function o(e,t){return function(r,n){if(r){t(r)}else if(arguments.length>2){e(Array.prototype.slice.call(arguments,1))}else{e(n)}}}function s(e){return function(){var t=Array.prototype.slice.call(arguments),r,s;var f=new n(function(e,t){r=e;s=t});i(t).then(function(t){t.push(o(r,s));try{e.apply(this,t)}catch(n){s(n)}});return f}}r.denodeify=s});e("rsvp/promise",["rsvp/config","rsvp/events","exports"],function(e,t,r){"use strict";var n=e.config;var i=t.EventTarget;function o(e){return s(e)||typeof e==="object"&&e!==null}function s(e){return typeof e==="function"}var f=function(e){var t=this,r=false;if(typeof e!=="function"){throw new TypeError("You must pass a resolver function as the sole argument to the promise constructor")}if(!(t instanceof f)){return new f(e)}var n=function(e){if(r){return}r=true;u(t,e)};var i=function(e){if(r){return}r=true;v(t,e)};this.on("promise:resolved",function(e){this.trigger("success",{detail:e.detail})},this);this.on("promise:failed",function(e){this.trigger("error",{detail:e.detail})},this);try{e(n,i)}catch(o){i(o)}};var c=function(e,t,r,n){var i=s(r),o,f,c,l;if(i){try{o=r(n.detail);c=true}catch(p){l=true;f=p}}else{o=n.detail;c=true}if(a(t,o)){return}else if(i&&c){u(t,o)}else if(l){v(t,f)}else if(e==="resolve"){u(t,o)}else if(e==="reject"){v(t,o)}};f.prototype={constructor:f,then:function(e,t){var r=new f(function(){});if(this.isFulfilled){n.async(function(){c("resolve",r,e,{detail:this.fulfillmentValue})},this)}if(this.isRejected){n.async(function(){c("reject",r,t,{detail:this.rejectedReason})},this)}this.on("promise:resolved",function(t){c("resolve",r,e,t)});this.on("promise:failed",function(e){c("reject",r,t,e)});return r}};i.mixin(f.prototype);function u(e,t){if(e===t){l(e,t)}else if(!a(e,t)){l(e,t)}}function a(e,t){var r=null;if(o(t)){try{r=t.then}catch(n){v(e,n);return true}if(s(r)){try{r.call(t,function(r){if(t!==r){u(e,r)}else{l(e,r)}},function(t){v(e,t)})}catch(n){v(e,n)}return true}}return false}function l(e,t){n.async(function(){e.trigger("promise:resolved",{detail:t});e.isFulfilled=true;e.fulfillmentValue=t})}function v(e,t){n.async(function(){e.trigger("promise:failed",{detail:t});e.isRejected=true;e.rejectedReason=t})}r.Promise=f});e("rsvp/reject",["rsvp/promise","exports"],function(e,t){"use strict";var r=e.Promise;function n(e){return typeof e==="function"||typeof e==="object"&&e!==null}function i(e){return new r(function(t,r){r(e)})}t.reject=i});e("rsvp/resolve",["rsvp/promise","exports"],function(e,t){"use strict";var r=e.Promise;function n(e){return typeof e==="function"||typeof e==="object"&&e!==null}function i(e){if(e instanceof r){return e}var t=new r(function(t,r){var i;try{if(n(e)){i=e.then;if(typeof i==="function"){i.call(e,t,r)}else{t(e)}}else{t(e)}}catch(o){r(o)}});return t}t.resolve=i});e("rsvp",["rsvp/events","rsvp/promise","rsvp/node","rsvp/all","rsvp/hash","rsvp/defer","rsvp/config","rsvp/resolve","rsvp/reject","exports"],function(e,t,r,n,i,o,s,f,c,u){"use strict";var a=e.EventTarget;var l=t.Promise;var v=r.denodeify;var p=n.all;var h=i.hash;var d=o.defer;var y=s.config;var m=f.resolve;var g=c.reject;function w(e,t){y[e]=t}u.Promise=l;u.EventTarget=a;u.all=p;u.hash=h;u.defer=d;u.denodeify=v;u.configure=w;u.resolve=m;u.reject=g});window.RSVP=t("rsvp")})(); (function(){var e,t;(function(){var r={},n={};e=function(e,t,n){r[e]={deps:t,callback:n}};t=function(e){if(n[e]){return n[e]}n[e]={};var i=r[e],o=i.deps,s=i.callback,f=[],c;for(var u=0,a=o.length;u<a;u++){if(o[u]==="exports"){f.push(c={})}else{f.push(t(o[u]))}}var v=s.apply(this,f);return n[e]=c||v}})();e("rsvp/all",["rsvp/promise","exports"],function(e,t){"use strict";var r=e.Promise;function n(e){return new r(function(t,r){var n=[],i=e.length,o;if(i===0){t([])}function s(e){return function(t){f(e,t)}}function f(e,r){n[e]=r;if(--i===0){t(n)}}for(var c=0;c<e.length;c++){o=e[c];if(o&&typeof o.then==="function"){o.then(s(c),r)}else{f(c,o)}}})}t.all=n});e("rsvp/async",["exports"],function(e){"use strict";var t=typeof window!=="undefined"?window:{};var r=t.MutationObserver||t.WebKitMutationObserver;var n;if(typeof process!=="undefined"&&{}.toString.call(process)==="[object process]"){n=function(e,t){process.nextTick(function(){e.call(t)})}}else if(r){var i=[];var o=new r(function(){var e=i.slice();i=[];e.forEach(function(e){var t=e[0],r=e[1];t.call(r)})});var s=document.createElement("div");o.observe(s,{attributes:true});window.addEventListener("unload",function(){o.disconnect();o=null});n=function(e,t){i.push([e,t]);s.setAttribute("drainQueue","drainQueue")}}else{n=function(e,t){setTimeout(function(){e.call(t)},1)}}e.async=n});e("rsvp/config",["rsvp/async","exports"],function(e,t){"use strict";var r=e.async;var n={};n.async=r;t.config=n});e("rsvp/defer",["rsvp/promise","exports"],function(e,t){"use strict";var r=e.Promise;function n(){var e={};var t=new r(function(t,r){e.resolve=t;e.reject=r});e.promise=t;return e}t.defer=n});e("rsvp/events",["exports"],function(e){"use strict";var t=function(e,t){this.type=e;for(var r in t){if(!t.hasOwnProperty(r)){continue}this[r]=t[r]}};var r=function(e,t){for(var r=0,n=e.length;r<n;r++){if(e[r][0]===t){return r}}return-1};var n=function(e){var t=e._promiseCallbacks;if(!t){t=e._promiseCallbacks={}}return t};var i={mixin:function(e){e.on=this.on;e.off=this.off;e.trigger=this.trigger;return e},on:function(e,t,i){var o=n(this),s,f;e=e.split(/\s+/);i=i||this;while(f=e.shift()){s=o[f];if(!s){s=o[f]=[]}if(r(s,t)===-1){s.push([t,i])}}},off:function(e,t){var i=n(this),o,s,f;e=e.split(/\s+/);while(s=e.shift()){if(!t){i[s]=[];continue}o=i[s];f=r(o,t);if(f!==-1){o.splice(f,1)}}},trigger:function(e,r){var i=n(this),o,s,f,c,u;if(o=i[e]){for(var a=0;a<o.length;a++){s=o[a];f=s[0];c=s[1];if(typeof r!=="object"){r={detail:r}}u=new t(e,r);f.call(c,u)}}}};e.EventTarget=i});e("rsvp/hash",["rsvp/defer","exports"],function(e,t){"use strict";var r=e.defer;function n(e){var t=0;for(var r in e){t++}return t}function i(e){var t={},i=r(),o=n(e);if(o===0){i.resolve({})}var s=function(e){return function(t){f(e,t)}};var f=function(e,r){t[e]=r;if(--o===0){i.resolve(t)}};var c=function(e){i.reject(e)};for(var u in e){if(e[u]&&typeof e[u].then==="function"){e[u].then(s(u),c)}else{f(u,e[u])}}return i.promise}t.hash=i});e("rsvp/promise",["rsvp/config","rsvp/events","exports"],function(e,t,r){"use strict";var n=e.config;var i=t.EventTarget;function o(e){return s(e)||typeof e==="object"&&e!==null}function s(e){return typeof e==="function"}var f=function(e){var t=this,r=false;if(typeof e!=="function"){throw new TypeError("You must pass a resolver function as the sole argument to the promise constructor")}if(!(t instanceof f)){return new f(e)}var n=function(e){if(r){return}r=true;u(t,e)};var i=function(e){if(r){return}r=true;l(t,e)};this.on("promise:resolved",function(e){this.trigger("success",{detail:e.detail})},this);this.on("promise:failed",function(e){this.trigger("error",{detail:e.detail})},this);try{e(n,i)}catch(o){i(o)}};var c=function(e,t,r,n){var i=s(r),o,f,c,v;if(i){try{o=r(n.detail);c=true}catch(p){v=true;f=p}}else{o=n.detail;c=true}if(a(t,o)){return}else if(i&&c){u(t,o)}else if(v){l(t,f)}else if(e==="resolve"){u(t,o)}else if(e==="reject"){l(t,o)}};f.prototype={constructor:f,then:function(e,t){var r=new f(function(){});if(this.isFulfilled){n.async(function(){c("resolve",r,e,{detail:this.fulfillmentValue})},this)}if(this.isRejected){n.async(function(){c("reject",r,t,{detail:this.rejectedReason})},this)}this.on("promise:resolved",function(t){c("resolve",r,e,t)});this.on("promise:failed",function(e){c("reject",r,t,e)});return r}};i.mixin(f.prototype);function u(e,t){if(e===t){v(e,t)}else if(!a(e,t)){v(e,t)}}function a(e,t){var r=null;if(o(t)){try{r=t.then}catch(n){l(e,n);return true}if(s(r)){try{r.call(t,function(r){if(t!==r){u(e,r)}else{v(e,r)}},function(t){l(e,t)})}catch(n){l(e,n)}return true}}return false}function v(e,t){n.async(function(){e.trigger("promise:resolved",{detail:t});e.isFulfilled=true;e.fulfillmentValue=t})}function l(e,t){n.async(function(){e.trigger("promise:failed",{detail:t});e.isRejected=true;e.rejectedReason=t})}r.Promise=f});e("rsvp/reject",["rsvp/promise","exports"],function(e,t){"use strict";var r=e.Promise;function n(e){return typeof e==="function"||typeof e==="object"&&e!==null}function i(e){return new r(function(t,r){r(e)})}t.reject=i});e("rsvp/resolve",["rsvp/promise","exports"],function(e,t){"use strict";var r=e.Promise;function n(e){return typeof e==="function"||typeof e==="object"&&e!==null}function i(e){if(e instanceof r){return e}var t=new r(function(t,r){var i;try{if(n(e)){i=e.then;if(typeof i==="function"){i.call(e,t,r)}else{t(e)}}else{t(e)}}catch(o){r(o)}});return t}t.resolve=i});e("rsvp",["rsvp/events","rsvp/promise","rsvp/node","rsvp/all","rsvp/hash","rsvp/defer","rsvp/config","rsvp/resolve","rsvp/reject","exports"],function(e,t,r,n,i,o,s,f,c,u){"use strict";var a=e.EventTarget;var v=t.Promise;var l=r.denodeify;var p=n.all;var h=i.hash;var d=o.defer;var y=s.config;var m=f.resolve;var g=c.reject;function w(e,t){y[e]=t}u.Promise=v;u.EventTarget=a;u.all=p;u.hash=h;u.defer=d;u.denodeify=l;u.configure=w;u.resolve=m;u.reject=g});window.RSVP=t("rsvp")})();
browser/rsvp/all.amd.js
View file @ 71f121c1
...@@ -6,7 +6,8 @@ define( ...@@ -6,7 +6,8 @@ define(
function all(promises) { function all(promises) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var results = [], remaining = promises.length; var results = [], remaining = promises.length,
promise;
if (remaining === 0) { if (remaining === 0) {
resolve([]); resolve([]);
...@@ -26,10 +27,12 @@ define( ...@@ -26,10 +27,12 @@ define(
} }
for (var i = 0; i < promises.length; i++) { for (var i = 0; i < promises.length; i++) {
if (promises[i] && typeof promises[i].then === 'function') { promise = promises[i];
promises[i].then(resolver(i), reject);
if (promise && typeof promise.then === 'function') {
promise.then(resolver(i), reject);
} else { } else {
resolveAll(i, promises[i]); resolveAll(i, promise);
} }
} }
}); });
......
browser/rsvp/node.amd.js
View file @ 71f121c1
define(
["rsvp/promise","rsvp/all","exports"],
function(__dependency1__, __dependency2__, __exports__) {
"use strict";
var Promise = __dependency1__.Promise;
var all = __dependency2__.all;
function makeNodeCallbackFor(resolve, reject) {
return function (error, value) {
if (error) {
reject(error);
} else if (arguments.length > 2) {
resolve(Array.prototype.slice.call(arguments, 1));
} else {
resolve(value);
}
};
}
function denodeify(nodeFunc) {
return function() {
var nodeArgs = Array.prototype.slice.call(arguments), resolve, reject;
var promise = new Promise(function(nodeResolve, nodeReject) {
resolve = nodeResolve;
reject = nodeReject;
});
all(nodeArgs).then(function(nodeArgs) {
nodeArgs.push(makeNodeCallbackFor(resolve, reject));
try {
nodeFunc.apply(this, nodeArgs);
} catch(e) {
reject(e);
}
});
return promise;
};
}
__exports__.denodeify = denodeify;
});
browser/rsvp/resolve.amd.js
View file @ 71f121c1
...@@ -8,12 +8,12 @@ define( ...@@ -8,12 +8,12 @@ define(
return typeof x === "function" || (typeof x === "object" && x !== null); return typeof x === "function" || (typeof x === "object" && x !== null);
} }
function resolve(thenable){ function resolve(thenable) {
if (thenable instanceof Promise) { if (thenable instanceof Promise) {
return thenable; return thenable;
} }
var promise = new Promise(function(resolve, reject){ var promise = new Promise(function(resolve, reject) {
var then; var then;
try { try {
......
lib/rsvp/all.js
View file @ 71f121c1
...@@ -2,7 +2,8 @@ import { Promise } from "rsvp/promise"; ...@@ -2,7 +2,8 @@ import { Promise } from "rsvp/promise";
function all(promises) { function all(promises) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var results = [], remaining = promises.length; var results = [], remaining = promises.length,
promise;
if (remaining === 0) { if (remaining === 0) {
resolve([]); resolve([]);
...@@ -22,10 +23,12 @@ function all(promises) { ...@@ -22,10 +23,12 @@ function all(promises) {
} }
for (var i = 0; i < promises.length; i++) { for (var i = 0; i < promises.length; i++) {
if (promises[i] && typeof promises[i].then === 'function') { promise = promises[i];
promises[i].then(resolver(i), reject);
if (promise && typeof promise.then === 'function') {
promise.then(resolver(i), reject);
} else { } else {
resolveAll(i, promises[i]); resolveAll(i, promise);
} }
} }
}); });
......
lib/rsvp/resolve.js
View file @ 71f121c1
...@@ -4,12 +4,12 @@ function objectOrFunction(x) { ...@@ -4,12 +4,12 @@ function objectOrFunction(x) {
return typeof x === "function" || (typeof x === "object" && x !== null); return typeof x === "function" || (typeof x === "object" && x !== null);
} }
function resolve(thenable){ function resolve(thenable) {
if (thenable instanceof Promise) { if (thenable instanceof Promise) {
return thenable; return thenable;
} }
var promise = new Promise(function(resolve, reject){ var promise = new Promise(function(resolve, reject) {
var then; var then;
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7