Merge branch 'master' of github.com:kriskowal/q

kriskowal · May 16, 2012 · 1048107 · 1048107
2 parents 614cd90 + 63a7afa
commit 1048107
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/q.js b/q.js
@@ -1389,8 +1389,14 @@ function ncall(callback, thisp /*, ...args*/) {
 exports.nbind = nbind;
 function nbind(callback /* thisp, ...args*/) {
     if (arguments.length > 1) {
-        var args = array_slice(arguments, 1);
-        callback = callback.bind.apply(callback, args);
+        var thisp = arguments[1];
+        var args = array_slice(arguments, 2);
+
+        var originalCallback = callback;
+        callback = function () {
+            var combinedArgs = args.concat(array_slice(arguments));
+            return originalCallback.apply(thisp, combinedArgs);
+        };
     }
     return function () {
         var deferred = defer();