From eb97dd80823338d30d3aad1df68a856728287e11 Mon Sep 17 00:00:00 2001 From: Tully Date: Tue, 10 Jun 2014 15:17:57 +0200 Subject: [PATCH] always return callback in each --- releases/latest/amanda.js | 17 +++++++---------- src/utils/each.js | 17 +++++++---------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/releases/latest/amanda.js b/releases/latest/amanda.js index 761f815..28d9e97 100644 --- 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 index 05ceb74..5d47cc7 100644 --- 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') {