Commit 69c6d7c9 authored by Romain Courteaud's avatar Romain Courteaud

Publish build version of rsvp.

parent 08ff89d4
...@@ -8,14 +8,14 @@ function promiseAtLeast(expected_count, promises) { ...@@ -8,14 +8,14 @@ function promiseAtLeast(expected_count, promises) {
throw new TypeError('You must pass an array to all.'); throw new TypeError('You must pass an array to all.');
} }
function canceller() { function canceller(msg) {
var promise; var promise;
for (var i = 0; i < promises.length; i++) { for (var i = 0; i < promises.length; i++) {
promise = promises[i]; promise = promises[i];
if (promise && typeof promise.then === 'function' && if (promise && typeof promise.then === 'function' &&
typeof promise.cancel === 'function') { typeof promise.cancel === 'function') {
promise.cancel(); promise.cancel(msg);
} }
} }
} }
......
...@@ -13,7 +13,7 @@ function size(object) { ...@@ -13,7 +13,7 @@ function size(object) {
function hash(promises) { function hash(promises) {
function canceller() { function canceller(msg) {
var promise, var promise,
key; key;
for (key in promises) { for (key in promises) {
...@@ -22,7 +22,7 @@ function hash(promises) { ...@@ -22,7 +22,7 @@ function hash(promises) {
if (promise && typeof promise.then === 'function' && if (promise && typeof promise.then === 'function' &&
typeof promise.cancel === 'function') { typeof promise.cancel === 'function') {
promise.cancel(); promise.cancel(msg);
} }
} }
} }
......
...@@ -46,21 +46,21 @@ var Promise = function(resolver, canceller) { ...@@ -46,21 +46,21 @@ var Promise = function(resolver, canceller) {
this.on('error', onerror); this.on('error', onerror);
this.cancel = function () { this.cancel = function (msg) {
// For now, simply reject the promise and does not propagate the cancel // For now, simply reject the promise and does not propagate the cancel
// to parent or children // to parent or children
if (resolved) { return; } if (resolved) { return; }
promise.isCancelled = true; promise.isCancelled = true;
if (canceller !== undefined) { if (canceller !== undefined) {
try { try {
canceller(); canceller(msg);
} catch (e) { } catch (e) {
rejectPromise(e); rejectPromise(e);
return; return;
} }
} }
// Trigger cancel? // Trigger cancel?
rejectPromise(new CancellationError()); rejectPromise(new CancellationError(msg));
}; };
try { try {
......
...@@ -25,9 +25,9 @@ var Queue = function(thenable) { ...@@ -25,9 +25,9 @@ var Queue = function(thenable) {
return new Queue(thenable); return new Queue(thenable);
} }
function canceller() { function canceller(msg) {
for (var i = promise_list.length; i > 0; i--) { for (var i = promise_list.length; i > 0; i--) {
promise_list[i - 1].cancel(); promise_list[i - 1].cancel(msg);
} }
} }
...@@ -70,10 +70,10 @@ var Queue = function(thenable) { ...@@ -70,10 +70,10 @@ var Queue = function(thenable) {
checkPromise(resolve(thenable)); checkPromise(resolve(thenable));
queue.cancel = function () { queue.cancel = function (msg) {
if (resolved) {return;} if (resolved) {return;}
resolved = true; resolved = true;
promise.cancel(); promise.cancel(msg);
promise.fail(function (rejectedReason) { promise.fail(function (rejectedReason) {
queue.isRejected = true; queue.isRejected = true;
queue.rejectedReason = rejectedReason; queue.rejectedReason = rejectedReason;
......
...@@ -10,9 +10,9 @@ function resolve(thenable) { ...@@ -10,9 +10,9 @@ function resolve(thenable) {
} }
} }
return resolve(thenable); return resolve(thenable);
}, function () { }, function (msg) {
if ((thenable !== undefined) && (thenable.cancel !== undefined)) { if ((thenable !== undefined) && (thenable.cancel !== undefined)) {
thenable.cancel(); thenable.cancel(msg);
} }
}); });
} }
......
...@@ -11,14 +11,14 @@ define("rsvp/all", ...@@ -11,14 +11,14 @@ define("rsvp/all",
throw new TypeError('You must pass an array to all.'); throw new TypeError('You must pass an array to all.');
} }
function canceller() { function canceller(msg) {
var promise; var promise;
for (var i = 0; i < promises.length; i++) { for (var i = 0; i < promises.length; i++) {
promise = promises[i]; promise = promises[i];
if (promise && typeof promise.then === 'function' && if (promise && typeof promise.then === 'function' &&
typeof promise.cancel === 'function') { typeof promise.cancel === 'function') {
promise.cancel(); promise.cancel(msg);
} }
} }
} }
...@@ -359,7 +359,7 @@ define("rsvp/hash", ...@@ -359,7 +359,7 @@ define("rsvp/hash",
function hash(promises) { function hash(promises) {
function canceller() { function canceller(msg) {
var promise, var promise,
key; key;
for (key in promises) { for (key in promises) {
...@@ -368,7 +368,7 @@ define("rsvp/hash", ...@@ -368,7 +368,7 @@ define("rsvp/hash",
if (promise && typeof promise.then === 'function' && if (promise && typeof promise.then === 'function' &&
typeof promise.cancel === 'function') { typeof promise.cancel === 'function') {
promise.cancel(); promise.cancel(msg);
} }
} }
} }
...@@ -515,21 +515,21 @@ define("rsvp/promise", ...@@ -515,21 +515,21 @@ define("rsvp/promise",
this.on('error', onerror); this.on('error', onerror);
this.cancel = function () { this.cancel = function (msg) {
// For now, simply reject the promise and does not propagate the cancel // For now, simply reject the promise and does not propagate the cancel
// to parent or children // to parent or children
if (resolved) { return; } if (resolved) { return; }
promise.isCancelled = true; promise.isCancelled = true;
if (canceller !== undefined) { if (canceller !== undefined) {
try { try {
canceller(); canceller(msg);
} catch (e) { } catch (e) {
rejectPromise(e); rejectPromise(e);
return; return;
} }
} }
// Trigger cancel? // Trigger cancel?
rejectPromise(new CancellationError()); rejectPromise(new CancellationError(msg));
}; };
try { try {
...@@ -736,9 +736,9 @@ define("rsvp/queue", ...@@ -736,9 +736,9 @@ define("rsvp/queue",
return new Queue(thenable); return new Queue(thenable);
} }
function canceller() { function canceller(msg) {
for (var i = promise_list.length; i > 0; i--) { for (var i = promise_list.length; i > 0; i--) {
promise_list[i - 1].cancel(); promise_list[i - 1].cancel(msg);
} }
} }
...@@ -781,10 +781,10 @@ define("rsvp/queue", ...@@ -781,10 +781,10 @@ define("rsvp/queue",
checkPromise(resolve(thenable)); checkPromise(resolve(thenable));
queue.cancel = function () { queue.cancel = function (msg) {
if (resolved) {return;} if (resolved) {return;}
resolved = true; resolved = true;
promise.cancel(); promise.cancel(msg);
promise.fail(function (rejectedReason) { promise.fail(function (rejectedReason) {
queue.isRejected = true; queue.isRejected = true;
queue.rejectedReason = rejectedReason; queue.rejectedReason = rejectedReason;
...@@ -847,9 +847,9 @@ define("rsvp/resolve", ...@@ -847,9 +847,9 @@ define("rsvp/resolve",
} }
} }
return resolve(thenable); return resolve(thenable);
}, function () { }, function (msg) {
if ((thenable !== undefined) && (thenable.cancel !== undefined)) { if ((thenable !== undefined) && (thenable.cancel !== undefined)) {
thenable.cancel(); thenable.cancel(msg);
} }
}); });
} }
......
...@@ -48,14 +48,14 @@ define("rsvp/all", ...@@ -48,14 +48,14 @@ define("rsvp/all",
throw new TypeError('You must pass an array to all.'); throw new TypeError('You must pass an array to all.');
} }
function canceller() { function canceller(msg) {
var promise; var promise;
for (var i = 0; i < promises.length; i++) { for (var i = 0; i < promises.length; i++) {
promise = promises[i]; promise = promises[i];
if (promise && typeof promise.then === 'function' && if (promise && typeof promise.then === 'function' &&
typeof promise.cancel === 'function') { typeof promise.cancel === 'function') {
promise.cancel(); promise.cancel(msg);
} }
} }
} }
...@@ -396,7 +396,7 @@ define("rsvp/hash", ...@@ -396,7 +396,7 @@ define("rsvp/hash",
function hash(promises) { function hash(promises) {
function canceller() { function canceller(msg) {
var promise, var promise,
key; key;
for (key in promises) { for (key in promises) {
...@@ -405,7 +405,7 @@ define("rsvp/hash", ...@@ -405,7 +405,7 @@ define("rsvp/hash",
if (promise && typeof promise.then === 'function' && if (promise && typeof promise.then === 'function' &&
typeof promise.cancel === 'function') { typeof promise.cancel === 'function') {
promise.cancel(); promise.cancel(msg);
} }
} }
} }
...@@ -552,21 +552,21 @@ define("rsvp/promise", ...@@ -552,21 +552,21 @@ define("rsvp/promise",
this.on('error', onerror); this.on('error', onerror);
this.cancel = function () { this.cancel = function (msg) {
// For now, simply reject the promise and does not propagate the cancel // For now, simply reject the promise and does not propagate the cancel
// to parent or children // to parent or children
if (resolved) { return; } if (resolved) { return; }
promise.isCancelled = true; promise.isCancelled = true;
if (canceller !== undefined) { if (canceller !== undefined) {
try { try {
canceller(); canceller(msg);
} catch (e) { } catch (e) {
rejectPromise(e); rejectPromise(e);
return; return;
} }
} }
// Trigger cancel? // Trigger cancel?
rejectPromise(new CancellationError()); rejectPromise(new CancellationError(msg));
}; };
try { try {
...@@ -773,9 +773,9 @@ define("rsvp/queue", ...@@ -773,9 +773,9 @@ define("rsvp/queue",
return new Queue(thenable); return new Queue(thenable);
} }
function canceller() { function canceller(msg) {
for (var i = promise_list.length; i > 0; i--) { for (var i = promise_list.length; i > 0; i--) {
promise_list[i - 1].cancel(); promise_list[i - 1].cancel(msg);
} }
} }
...@@ -818,10 +818,10 @@ define("rsvp/queue", ...@@ -818,10 +818,10 @@ define("rsvp/queue",
checkPromise(resolve(thenable)); checkPromise(resolve(thenable));
queue.cancel = function () { queue.cancel = function (msg) {
if (resolved) {return;} if (resolved) {return;}
resolved = true; resolved = true;
promise.cancel(); promise.cancel(msg);
promise.fail(function (rejectedReason) { promise.fail(function (rejectedReason) {
queue.isRejected = true; queue.isRejected = true;
queue.rejectedReason = rejectedReason; queue.rejectedReason = rejectedReason;
...@@ -884,9 +884,9 @@ define("rsvp/resolve", ...@@ -884,9 +884,9 @@ define("rsvp/resolve",
} }
} }
return resolve(thenable); return resolve(thenable);
}, function () { }, function (msg) {
if ((thenable !== undefined) && (thenable.cancel !== undefined)) { if ((thenable !== undefined) && (thenable.cancel !== undefined)) {
thenable.cancel(); thenable.cancel(msg);
} }
}); });
} }
......
This diff is collapsed.
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