summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolan McMahon <caolan.mcmahon@gmail.com>2014-03-30 21:33:23 +0100
committerCaolan McMahon <caolan.mcmahon@gmail.com>2014-03-30 21:33:23 +0100
commit5bf4092b8ad783c3846667834a08d322f661e52b (patch)
treef5cbbf33f1fbbdd7e8627d683e500c8d18a9a91f
parent4f45a7d8825c88960308fb36e2a6e07d4b73810c (diff)
parente6e3434570773a7552bec9a6354005611ffa264a (diff)
downloadasync-5bf4092b8ad783c3846667834a08d322f661e52b.tar.gz
Merge pull request #479 from Mithgol/detect-extracontextual-functions
also detect functions coming from other JavaScript contexts
-rwxr-xr-xlib/async.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/async.js b/lib/async.js
index c9f355f..bca33c6 100755
--- a/lib/async.js
+++ b/lib/async.js
@@ -32,6 +32,11 @@
return toString.call(obj) === '[object Array]';
};
+ var _isFunction = function (obj) {
+ return obj instanceof Function ||
+ toString.call(obj) === '[object Function]';
+ };
+
var _each = function (arr, iterator) {
if (arr.forEach) {
return arr.forEach(iterator);
@@ -439,7 +444,7 @@
});
_each(keys, function (k) {
- var task = (tasks[k] instanceof Function) ? [tasks[k]]: tasks[k];
+ var task = _isFunction(tasks[k]) ? [tasks[k]]: tasks[k];
var taskCallback = function (err) {
var args = Array.prototype.slice.call(arguments, 1);
if (args.length <= 1) {