cleanup RSVP.all

browser/rsvp.js

@@ -39,7 +39,8 @@ define("rsvp/all",
 
     function all(promises) {
       return new Promise(function(resolve, reject) {
-        var results = [], remaining = promises.length;
+        var results = [], remaining = promises.length,
+        promise;
 
         if (remaining === 0) {
           resolve([]);
@@ -59,10 +60,12 @@ define("rsvp/all",
         }
 
         for (var i = 0; i < promises.length; i++) {
-          if (promises[i] && typeof promises[i].then === 'function') {
-            promises[i].then(resolver(i), reject);
+          promise = promises[i];
+
+          if (promise && typeof promise.then === 'function') {
+            promise.then(resolver(i), reject);
           } else {
-            resolveAll(i, promises[i]);
+            resolveAll(i, promise);
           }
         }
       });
@@ -315,50 +318,7 @@ define("rsvp/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",
   ["rsvp/config","rsvp/events","exports"],
@@ -568,12 +528,12 @@ define("rsvp/resolve",
       return typeof x === "function" || (typeof x === "object" && x !== null);
     }
 
-    function resolve(thenable){
+    function resolve(thenable) {
       if (thenable instanceof Promise) {
         return thenable;
       }
 
-      var promise = new Promise(function(resolve, reject){
+      var promise = new Promise(function(resolve, reject) {
         var then;
 
         try {

browser/rsvp/all.amd.js

@@ -6,7 +6,8 @@ define(
 
     function all(promises) {
       return new Promise(function(resolve, reject) {
-        var results = [], remaining = promises.length;
+        var results = [], remaining = promises.length,
+        promise;
 
         if (remaining === 0) {
           resolve([]);
@@ -26,10 +27,12 @@ define(
         }
 
         for (var i = 0; i < promises.length; i++) {
-          if (promises[i] && typeof promises[i].then === 'function') {
-            promises[i].then(resolver(i), reject);
+          promise = promises[i];
+
+          if (promise && typeof promise.then === 'function') {
+            promise.then(resolver(i), reject);
           } else {
-            resolveAll(i, promises[i]);
+            resolveAll(i, promise);
           }
         }
       });

browser/rsvp/node.amd.js

-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

@@ -8,12 +8,12 @@ define(
       return typeof x === "function" || (typeof x === "object" && x !== null);
     }
 
-    function resolve(thenable){
+    function resolve(thenable) {
       if (thenable instanceof Promise) {
         return thenable;
       }
 
-      var promise = new Promise(function(resolve, reject){
+      var promise = new Promise(function(resolve, reject) {
         var then;
 
         try {

lib/rsvp/all.js

@@ -2,7 +2,8 @@ import { Promise } from "rsvp/promise";
 
 function all(promises) {
   return new Promise(function(resolve, reject) {
-    var results = [], remaining = promises.length;
+    var results = [], remaining = promises.length,
+    promise;
 
     if (remaining === 0) {
       resolve([]);
@@ -22,10 +23,12 @@ function all(promises) {
     }
 
     for (var i = 0; i < promises.length; i++) {
-      if (promises[i] && typeof promises[i].then === 'function') {
-        promises[i].then(resolver(i), reject);
+      promise = promises[i];
+
+      if (promise && typeof promise.then === 'function') {
+        promise.then(resolver(i), reject);
       } else {
-        resolveAll(i, promises[i]);
+        resolveAll(i, promise);
       }
     }
   });

lib/rsvp/resolve.js

@@ -4,12 +4,12 @@ function objectOrFunction(x) {
   return typeof x === "function" || (typeof x === "object" && x !== null);
 }
 
-function resolve(thenable){
+function resolve(thenable) {
   if (thenable instanceof Promise) {
     return thenable;
   }
 
-  var promise = new Promise(function(resolve, reject){
+  var promise = new Promise(function(resolve, reject) {
     var then;
 
     try {