Release v2.1.3

petkaantonov · Jun 18, 2014 · 3a682d4 · 3a682d4
1 parent 3669737
commit 3a682d4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bluebird",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "homepage": "https://github.com/petkaantonov/bluebird",
   "authors": [
     "Petka Antonov <[email protected]>"

diff --git a/browser/bundle.js b/browser/bundle.js
@@ -5874,10 +5874,10 @@ function Promise$_spreadSlowCase(targetFn, promise, values, boundTo) {
     ASSERT(((typeof targetFn) === "function"),
     "typeof targetFn === \u0022function\u0022");
     var promiseForAll = new PromiseArray(values).promise();
-    promiseForAll._then(function() {
+    var promise2 = promiseForAll._then(function() {
         return targetFn.apply(boundTo, arguments);
-    }, INTERNAL, void 0, APPLY, void 0);
-    promise._follow(promiseForAll);
+    }, void 0, void 0, APPLY, void 0);
+    promise._follow(promise2);
 };
 
 Promise.prototype._callSpread =
@@ -27310,6 +27310,17 @@ describe("spread", function () {
         })
     });
 
+    specify("gh-235", function(done) {
+        var P = Promise;
+        P.resolve(1).then(function(x) {
+          return [x, P.resolve(2)]
+        }).spread(function(x, y) {
+          return P.all([P.resolve(3), P.resolve(4)]);
+        }).then(function(a) {
+          assert.deepEqual([3, 4], a);
+          done();
+        });
+    })
 });
 
 },{"../../js/debug/bluebird.js":21,"assert":2}],125:[function(require,module,exports){

diff --git a/js/browser/bluebird.js b/js/browser/bluebird.js
@@ -1,5 +1,5 @@
 /**
- * bluebird build version 2.1.2
+ * bluebird build version 2.1.3
  * Features enabled: core, race, call_get, generators, map, nodeify, promisify, props, reduce, settle, some, progress, cancel, using, filter, any, each, timers
 */
 /**
@@ -2481,10 +2481,10 @@ function Promise$_resolveFromResolver(resolver) {
 Promise.prototype._spreadSlowCase =
 function Promise$_spreadSlowCase(targetFn, promise, values, boundTo) {
     var promiseForAll = new PromiseArray(values).promise();
-    promiseForAll._then(function() {
+    var promise2 = promiseForAll._then(function() {
         return targetFn.apply(boundTo, arguments);
-    }, INTERNAL, void 0, APPLY, void 0);
-    promise._follow(promiseForAll);
+    }, void 0, void 0, APPLY, void 0);
+    promise._follow(promise2);
 };
 
 Promise.prototype._callSpread =

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "bluebird",
     "description": "Full featured Promises/A+ implementation with exceptionally good performance",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "keywords": [
         "promise",
         "performance",