Removing _.delay ... making _.defer equivalent to the previous proces…

…s.nextTick

test/async.js

@@ -4,17 +4,17 @@ if (typeof require !== 'undefined') {
 
 (function (exports) {
 
-exports['async: nextTick'] = function(test){
+exports['async: defer'] = function(test){
     var call_order = [];
-    _.nextTick(function(){call_order.push('two');});
+    _.defer(function(){call_order.push('two');});
     call_order.push('one');
     setTimeout(function(){
         test.same(call_order, ['one','two']);
         test.done();
     }, 50);
 };
 
-exports['async: nextTick in node'] = function(test){
+exports['async: defer in node'] = function(test){
     test.expect(1);
     var browser = false;
     if (typeof process === 'undefined') {
@@ -32,10 +32,10 @@ exports['async: nextTick in node'] = function(test){
         test.ok(true, 'process.nextTick called');
         test.done();
     };
-    _.nextTick(function(){});
+    _.defer(function(){});
 };
 
-exports['async: nextTick in the browser'] = function(test){
+exports['async: defer in the browser'] = function(test){
     test.expect(1);
 
     if (typeof process !== 'undefined') {
@@ -44,7 +44,7 @@ exports['async: nextTick in the browser'] = function(test){
     }
 
     var call_order = [];
-    _.nextTick(function(){call_order.push('two');});
+    _.defer(function(){call_order.push('two');});
 
     call_order.push('one');
     setTimeout(function(){
@@ -210,7 +210,7 @@ exports['async: asyncReduce'] = function(test){
 
 exports['async: asyncReduce async with non-reference memo'] = function(test){
     _.asyncReduce([1,3,2], 0, function(a, x, callback){
-        setTimeout(function(){callback(null, a + x)}, Math.random()*100);
+        setTimeout(function(){ callback(null, a + x); }, Math.random()*100);
     }, function(err, result){
         test.equals(result, 6);
         test.done();
@@ -557,7 +557,7 @@ exports['async: parallel error'] = function(test){
 exports['async: parallel no callback'] = function(test){
     _.parallel([
         function(callback){callback();},
-        function(callback){callback(); test.done();},
+        function(callback){callback(); test.done();}
     ]);
 };
 
@@ -653,7 +653,7 @@ exports['async: series error'] = function(test){
 exports['async: series no callback'] = function(test){
     _.series([
         function(callback){callback();},
-        function(callback){callback(); test.done();},
+        function(callback){callback(); test.done();}
     ]);
 };
 
@@ -1068,7 +1068,7 @@ exports['async: asyncWhile'] = function (test) {
                 ['iterator', 1], ['test', 2],
                 ['iterator', 2], ['test', 3],
                 ['iterator', 3], ['test', 4],
-                ['iterator', 4], ['test', 5],
+                ['iterator', 4], ['test', 5]
             ]);
             test.equals(count, 5);
             test.done();

test/functions.js

@@ -62,19 +62,11 @@ exports["functions: memoize"] = function(test) {
   test.done();
 };
 
-exports["functions: delay"] = function(test) {
-  test.expect(2);
-  var delayed = false;
-  _.delay(function(){ delayed = true; }, 100);
-  _.delay(function(){ test.ok(!delayed, "didn't delay the function quite yet"); }, 50);
-  _.delay(function(){ test.ok(delayed, 'delayed the function'); test.done(); }, 150);
-};
-
 exports["functions: defer"] = function(test) {
   test.expect(1);
   var deferred = false;
-  _.defer(function(bool){ deferred = bool; }, true);
-  _.delay(function(){ test.ok(deferred, "deferred the function"); test.done(); }, 50);
+  _.defer(function(){ deferred = true; });
+  setTimeout(function(){ test.ok(deferred, "deferred the function"); test.done(); }, 50);
 };
 
 exports["functions: throttle"] = function(test) {
@@ -87,7 +79,7 @@ exports["functions: throttle"] = function(test) {
   setTimeout(throttledIncr, 70);
   setTimeout(throttledIncr, 110);
   setTimeout(throttledIncr, 120);
-  _.delay(function(){ test.ok(counter == 3, "incr was throttled"); test.done(); }, 180);
+  setTimeout(function(){ test.ok(counter == 3, "incr was throttled"); test.done(); }, 180);
 };
 
 exports["functions: debounce"] = function(test) {
@@ -101,7 +93,7 @@ exports["functions: debounce"] = function(test) {
   setTimeout(debouncedIncr, 90);
   setTimeout(debouncedIncr, 120);
   setTimeout(debouncedIncr, 150);
-  _.delay(function(){ test.ok(counter == 1, "incr was debounced"); test.done(); }, 220);
+  setTimeout(function(){ test.ok(counter == 1, "incr was debounced"); test.done(); }, 220);
 };
 
 exports["functions: wrap"] = function(test) {

underscore.js

@@ -410,17 +410,15 @@
     };
   };
 
-  // Delays a function for the given number of milliseconds, and then calls
-  // it with the arguments supplied.
-  _.delay = function(func, wait) {
-    var args = slice.call(arguments, 2);
-    return setTimeout(function(){ return func.apply(func, args); }, wait);
-  };
-
   // Defers a function, scheduling it to run after the current call stack has
-  // cleared.
+  // cleared. If we're running on Node.js, this is implemented with `nextTick`,
+  // otherwise, use a `setTimeout`.
   _.defer = function(func) {
-    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
+    if (typeof process !== 'undefined' && process.nextTick) {
+      process.nextTick(func);
+    } else {
+      setTimeout(func, 0);
+    }
   };
 
   // Internal function used to implement `_.throttle` and `_.debounce`.
@@ -700,16 +698,6 @@
   // Start of async.js merge - Caolan McMahon (@caolan)
   // --------------------------------------------------
 
-  //// nextTick implementation with browser-compatible fallback ////
-  _.nextTick = function (fn) {
-    if (typeof process === 'undefined' || !(process.nextTick)) {
-      setTimeout(fn, 0);
-    }
-    else {
-      process.nextTick(fn);
-    }
-  };
-
   _.asyncEach = _.asyncForEach = function (arr, iterator, callback) {
     if (!arr.length) {
       return callback();
@@ -1075,7 +1063,7 @@
           else {
             args.push(callback);
           }
-          _.nextTick(function () {
+          _.defer(function () {
             iterator.apply(null, args);
           });
         }
@@ -1107,7 +1095,7 @@
       concurrency: concurrency,
       push: function (data, callback) {
         tasks.push({data: data, callback: callback});
-        _.nextTick(q.process);
+        _.defer(q.process);
       },
       process: function () {
         if (workers < q.concurrency && tasks.length) {