aboutsummaryrefslogtreecommitdiff
path: root/node_modules/async/internal/parallel.js
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-05-24 15:10:37 +0200
committerFlorian Dold <florian.dold@gmail.com>2017-05-24 15:11:17 +0200
commit7a3df06eb573d36142bd1a8e03c5ce8752d300b3 (patch)
tree70bfaea8884c374876f607774850a3a51c0cb381 /node_modules/async/internal/parallel.js
parentaca1143cb9eed16cf37f04e475e4257418dd18ac (diff)
fix build issues and add typedoc
Diffstat (limited to 'node_modules/async/internal/parallel.js')
-rw-r--r--node_modules/async/internal/parallel.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/node_modules/async/internal/parallel.js b/node_modules/async/internal/parallel.js
index 1a27c2a54..c97293b6c 100644
--- a/node_modules/async/internal/parallel.js
+++ b/node_modules/async/internal/parallel.js
@@ -13,9 +13,9 @@ var _isArrayLike = require('lodash/isArrayLike');
var _isArrayLike2 = _interopRequireDefault(_isArrayLike);
-var _rest = require('./rest');
+var _slice = require('./slice');
-var _rest2 = _interopRequireDefault(_rest);
+var _slice2 = _interopRequireDefault(_slice);
var _wrapAsync = require('./wrapAsync');
@@ -28,13 +28,13 @@ function _parallel(eachfn, tasks, callback) {
var results = (0, _isArrayLike2.default)(tasks) ? [] : {};
eachfn(tasks, function (task, key, callback) {
- (0, _wrapAsync2.default)(task)((0, _rest2.default)(function (err, args) {
- if (args.length <= 1) {
- args = args[0];
+ (0, _wrapAsync2.default)(task)(function (err, result) {
+ if (arguments.length > 2) {
+ result = (0, _slice2.default)(arguments, 1);
}
- results[key] = args;
+ results[key] = result;
callback(err);
- }));
+ });
}, function (err) {
callback(err, results);
});