always return callback in each

Baggz · Jun 10, 2014 · eb97dd8 · eb97dd8
1 parent 0a4fa0e
commit eb97dd8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/releases/latest/amanda.js b/releases/latest/amanda.js
@@ -68,8 +68,7 @@ var each = function(list, iterator, callback) {
       var tryCallback = function() {
         if (mayCallback && finished == started) {
           // finished all functions, celebrate!
-          callback();
-          return;
+            return callback();
         }
       }
 
@@ -87,19 +86,18 @@ var each = function(list, iterator, callback) {
           if (error) {
             // if error, fail fast
             hasCalled = true;
-            callback(error);
-            return;
+            return callback(error);
+
           }
 
           finished++;
-          tryCallback();
-          return;
+            return tryCallback();
+
         };
 
         // execute right away
         started++;
-        iterator(key, value, cb);
-        return;
+        return iterator(key, value, cb);
       }
 
 
@@ -124,8 +122,7 @@ var each = function(list, iterator, callback) {
 
       // Done adding items. Allow callback to fire
       mayCallback = true
-      tryCallback();
-      return;
+      return tryCallback();
     };
 
     if (typeof callback === 'undefined') {

diff --git a/src/utils/each.js b/src/utils/each.js
@@ -51,8 +51,7 @@ var each = function(list, iterator, callback) {
       var tryCallback = function() {
         if (mayCallback && finished == started) {
           // finished all functions, celebrate!
-          callback();
-          return;
+            return callback();
         }
       }
 
@@ -70,19 +69,18 @@ var each = function(list, iterator, callback) {
           if (error) {
             // if error, fail fast
             hasCalled = true;
-            callback(error);
-            return;
+            return callback(error);
+
           }
 
           finished++;
-          tryCallback();
-          return;
+            return tryCallback();
+
         };
 
         // execute right away
         started++;
-        iterator(key, value, cb);
-        return;
+        return iterator(key, value, cb);
       }
 
 
@@ -107,8 +105,7 @@ var each = function(list, iterator, callback) {
 
       // Done adding items. Allow callback to fire
       mayCallback = true
-      tryCallback();
-      return;
+      return tryCallback();
     };
 
     if (typeof callback === 'undefined') {