diff options
author | Alexander Early <alexander.early@gmail.com> | 2018-04-14 20:10:29 -0700 |
---|---|---|
committer | Alexander Early <alexander.early@gmail.com> | 2018-04-14 20:10:29 -0700 |
commit | 45e2938cfa536fe27898c60a4e0fe37080c880bb (patch) | |
tree | c0cb0776b596908d1a79f77c1a30a138dcba6a00 /lib/auto.js | |
parent | 2030f5f1bd01a141ac4c85d3deab927f49e255fc (diff) | |
parent | 3235c8f5f67ff38b85ce6f9664053d0b1897ff3b (diff) | |
download | async-45e2938cfa536fe27898c60a4e0fe37080c880bb.tar.gz |
Merge branch 'master' into DELETE_THIS_BRANCHDELETE_THIS_BRANCH
Diffstat (limited to 'lib/auto.js')
-rw-r--r-- | lib/auto.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/auto.js b/lib/auto.js index ba0fdc3..e2c0ab9 100644 --- a/lib/auto.js +++ b/lib/auto.js @@ -4,8 +4,8 @@ import indexOf from 'lodash/_baseIndexOf'; import isArray from 'lodash/isArray'; import okeys from 'lodash/keys'; import noop from 'lodash/noop'; -import rest from './internal/rest'; +import slice from './internal/slice'; import once from './internal/once'; import onlyOnce from './internal/onlyOnce'; import wrapAsync from './internal/wrapAsync'; @@ -192,26 +192,26 @@ export default function (tasks, concurrency, callback) { function runTask(key, task) { if (hasError) return; - var taskCallback = onlyOnce(rest(function(err, args) { + var taskCallback = onlyOnce(function(err, result) { runningTasks--; - if (args.length <= 1) { - args = args[0]; + if (arguments.length > 2) { + result = slice(arguments, 1); } if (err) { var safeResults = {}; forOwn(results, function(val, rkey) { safeResults[rkey] = val; }); - safeResults[key] = args; + safeResults[key] = result; hasError = true; listeners = Object.create(null); callback(err, safeResults); } else { - results[key] = args; + results[key] = result; taskComplete(key); } - })); + }); runningTasks++; var taskFn = wrapAsync(task[task.length - 1]); |