Publish build version of rsvp

dist/commonjs/rsvp/promise.js

@@ -50,6 +50,7 @@ var Promise = function(resolver, canceller) {
     // For now, simply reject the promise and does not propagate the cancel
     // to parent or children
     if (resolved) { return; }
+    promise.isCancelled = true;
     if (canceller !== undefined) {
       try {
         canceller();
@@ -81,6 +82,7 @@ var invokeCallback = function(type, promise, callback, event) {
 
   if (promise.isFulfilled) { return; }
   if (promise.isRejected) { return; }
+  if (promise.isCancelled) { return; }
 
   if (hasCallback) {
     try {
@@ -111,6 +113,7 @@ var invokeCallback = function(type, promise, callback, event) {
 Promise.prototype = {
   constructor: Promise,
 
+  isCancelled: undefined,
   isRejected: undefined,
   isFulfilled: undefined,
   rejectedReason: undefined,

dist/commonjs/rsvp/queue.js

@@ -13,7 +13,7 @@ function ResolvedQueueError(message) {
 ResolvedQueueError.prototype = new Error();
 ResolvedQueueError.prototype.constructor = ResolvedQueueError;
 
-var Queue = function() {
+var Queue = function(thenable) {
   var queue = this,
     promise_list = [],
     promise,
@@ -26,11 +26,31 @@ var Queue = function() {
   }
 
   function canceller() {
-    for (var i = 0; i < 2; i++) {
-      promise_list[i].cancel();
+    for (var i = promise_list.length; i > 0; i--) {
+      promise_list[i - 1].cancel();
     }
   }
 
+  function checkPromise(next_promise) {
+    promise_list.push(next_promise);
+    // Handle pop
+    promise_list.push(next_promise.then(function (fulfillmentValue) {
+      promise_list.splice(0, 2);
+      if (promise_list.length === 0) {
+        fulfill(fulfillmentValue);
+      } else {
+        return fulfillmentValue;
+      }
+    }, function (rejectedReason) {
+      promise_list.splice(0, 2);
+      if (promise_list.length === 0) {
+        reject(rejectedReason);
+      } else {
+        throw rejectedReason;
+      }
+    }));
+  }
+
   promise = new Promise(function(done, fail) {
     fulfill = function (fulfillmentValue) {
       if (resolved) {return;}
@@ -48,13 +68,7 @@ var Queue = function() {
     };
   }, canceller);
 
-  promise_list.push(resolve());
-  promise_list.push(promise_list[0].then(function () {
-    promise_list.splice(0, 2);
-    if (promise_list.length === 0) {
-      fulfill();
-    }
-  }));
+  checkPromise(resolve(thenable));
 
   queue.cancel = function () {
     if (resolved) {return;}
@@ -77,25 +91,9 @@ var Queue = function() {
       throw new ResolvedQueueError();
     }
 
-    next_promise = last_promise.then(done, fail);
-    promise_list.push(next_promise);
-
     // Handle pop
-    promise_list.push(next_promise.then(function (fulfillmentValue) {
-      promise_list.splice(0, 2);
-      if (promise_list.length === 0) {
-        fulfill(fulfillmentValue);
-      } else {
-        return fulfillmentValue;
-      }
-    }, function (rejectedReason) {
-      promise_list.splice(0, 2);
-      if (promise_list.length === 0) {
-        reject(rejectedReason);
-      } else {
-        throw rejectedReason;
-      }
-    }));
+    checkPromise(last_promise.then(done, fail));
+
 
     return this;
   };

dist/rsvp-2.0.4.amd.js

@@ -519,6 +519,7 @@ define("rsvp/promise",
         // For now, simply reject the promise and does not propagate the cancel
         // to parent or children
         if (resolved) { return; }
+        promise.isCancelled = true;
         if (canceller !== undefined) {
           try {
             canceller();
@@ -550,6 +551,7 @@ define("rsvp/promise",
 
       if (promise.isFulfilled) { return; }
       if (promise.isRejected) { return; }
+      if (promise.isCancelled) { return; }
 
       if (hasCallback) {
         try {
@@ -580,6 +582,7 @@ define("rsvp/promise",
     Promise.prototype = {
       constructor: Promise,
 
+      isCancelled: undefined,
       isRejected: undefined,
       isFulfilled: undefined,
       rejectedReason: undefined,
@@ -721,7 +724,7 @@ define("rsvp/queue",
     ResolvedQueueError.prototype = new Error();
     ResolvedQueueError.prototype.constructor = ResolvedQueueError;
 
-    var Queue = function() {
+    var Queue = function(thenable) {
       var queue = this,
         promise_list = [],
         promise,
@@ -734,11 +737,31 @@ define("rsvp/queue",
       }
 
       function canceller() {
-        for (var i = 0; i < 2; i++) {
-          promise_list[i].cancel();
+        for (var i = promise_list.length; i > 0; i--) {
+          promise_list[i - 1].cancel();
         }
       }
 
+      function checkPromise(next_promise) {
+        promise_list.push(next_promise);
+        // Handle pop
+        promise_list.push(next_promise.then(function (fulfillmentValue) {
+          promise_list.splice(0, 2);
+          if (promise_list.length === 0) {
+            fulfill(fulfillmentValue);
+          } else {
+            return fulfillmentValue;
+          }
+        }, function (rejectedReason) {
+          promise_list.splice(0, 2);
+          if (promise_list.length === 0) {
+            reject(rejectedReason);
+          } else {
+            throw rejectedReason;
+          }
+        }));
+      }
+
       promise = new Promise(function(done, fail) {
         fulfill = function (fulfillmentValue) {
           if (resolved) {return;}
@@ -756,13 +779,7 @@ define("rsvp/queue",
         };
       }, canceller);
 
-      promise_list.push(resolve());
-      promise_list.push(promise_list[0].then(function () {
-        promise_list.splice(0, 2);
-        if (promise_list.length === 0) {
-          fulfill();
-        }
-      }));
+      checkPromise(resolve(thenable));
 
       queue.cancel = function () {
         if (resolved) {return;}
@@ -785,25 +802,9 @@ define("rsvp/queue",
           throw new ResolvedQueueError();
         }
 
-        next_promise = last_promise.then(done, fail);
-        promise_list.push(next_promise);
-
         // Handle pop
-        promise_list.push(next_promise.then(function (fulfillmentValue) {
-          promise_list.splice(0, 2);
-          if (promise_list.length === 0) {
-            fulfill(fulfillmentValue);
-          } else {
-            return fulfillmentValue;
-          }
-        }, function (rejectedReason) {
-          promise_list.splice(0, 2);
-          if (promise_list.length === 0) {
-            reject(rejectedReason);
-          } else {
-            throw rejectedReason;
-          }
-        }));
+        checkPromise(last_promise.then(done, fail));
+
 
         return this;
       };

dist/rsvp-2.0.4.js

@@ -556,6 +556,7 @@ define("rsvp/promise",
         // For now, simply reject the promise and does not propagate the cancel
         // to parent or children
         if (resolved) { return; }
+        promise.isCancelled = true;
         if (canceller !== undefined) {
           try {
             canceller();
@@ -587,6 +588,7 @@ define("rsvp/promise",
 
       if (promise.isFulfilled) { return; }
       if (promise.isRejected) { return; }
+      if (promise.isCancelled) { return; }
 
       if (hasCallback) {
         try {
@@ -617,6 +619,7 @@ define("rsvp/promise",
     Promise.prototype = {
       constructor: Promise,
 
+      isCancelled: undefined,
       isRejected: undefined,
       isFulfilled: undefined,
       rejectedReason: undefined,
@@ -758,7 +761,7 @@ define("rsvp/queue",
     ResolvedQueueError.prototype = new Error();
     ResolvedQueueError.prototype.constructor = ResolvedQueueError;
 
-    var Queue = function() {
+    var Queue = function(thenable) {
       var queue = this,
         promise_list = [],
         promise,
@@ -771,11 +774,31 @@ define("rsvp/queue",
       }
 
       function canceller() {
-        for (var i = 0; i < 2; i++) {
-          promise_list[i].cancel();
+        for (var i = promise_list.length; i > 0; i--) {
+          promise_list[i - 1].cancel();
         }
       }
 
+      function checkPromise(next_promise) {
+        promise_list.push(next_promise);
+        // Handle pop
+        promise_list.push(next_promise.then(function (fulfillmentValue) {
+          promise_list.splice(0, 2);
+          if (promise_list.length === 0) {
+            fulfill(fulfillmentValue);
+          } else {
+            return fulfillmentValue;
+          }
+        }, function (rejectedReason) {
+          promise_list.splice(0, 2);
+          if (promise_list.length === 0) {
+            reject(rejectedReason);
+          } else {
+            throw rejectedReason;
+          }
+        }));
+      }
+
       promise = new Promise(function(done, fail) {
         fulfill = function (fulfillmentValue) {
           if (resolved) {return;}
@@ -793,13 +816,7 @@ define("rsvp/queue",
         };
       }, canceller);
 
-      promise_list.push(resolve());
-      promise_list.push(promise_list[0].then(function () {
-        promise_list.splice(0, 2);
-        if (promise_list.length === 0) {
-          fulfill();
-        }
-      }));
+      checkPromise(resolve(thenable));
 
       queue.cancel = function () {
         if (resolved) {return;}
@@ -822,25 +839,9 @@ define("rsvp/queue",
           throw new ResolvedQueueError();
         }
 
-        next_promise = last_promise.then(done, fail);
-        promise_list.push(next_promise);
-
         // Handle pop
-        promise_list.push(next_promise.then(function (fulfillmentValue) {
-          promise_list.splice(0, 2);
-          if (promise_list.length === 0) {
-            fulfill(fulfillmentValue);
-          } else {
-            return fulfillmentValue;
-          }
-        }, function (rejectedReason) {
-          promise_list.splice(0, 2);
-          if (promise_list.length === 0) {
-            reject(rejectedReason);
-          } else {
-            throw rejectedReason;
-          }
-        }));
+        checkPromise(last_promise.then(done, fail));
+
 
         return this;
       };