[Pkg-javascript-commits] [node-async] 196/480: Imported Upstream version 0.1.22

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository node-async.

commit 90c40c2e054680daa1fca17c18698bac9d4beaf1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jun 1 09:14:37 2012 +0200

    Imported Upstream version 0.1.22
---
 dist/async.min.js  | 2 +-
 lib/async.js       | 2 +-
 package.json       | 2 +-
 test/test-async.js | 6 +++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dist/async.min.js b/dist/async.min.js
index af28086..6ba3145 100644
--- a/dist/async.min.js
+++ b/dist/async.min.js
@@ -1 +1 @@
-/*global setTimeout: false, console: false */(function(){var a={},b=this,c=b.async;typeof module!="undefined"&&module.exports?module.exports=a:b.async=a,a.noConflict=function(){return b.async=c,a};var d=function(a,b){if(a.forEach)return a.forEach(b);for(var c=0;c<a.length;c+=1)b(a[c],c,a)},e=function(a,b){if(a.map)return a.map(b);var c=[];return d(a,function(a,d,e){c.push(b(a,d,e))}),c},f=function(a,b,c){return a.reduce?a.reduce(b,c):(d(a,function(a,d,e){c=b(c,a,d,e)}),c)},g=function(a){ [...]
\ No newline at end of file
+/*global setTimeout: false, console: false */(function(){var a={},b=this,c=b.async;typeof module!="undefined"&&module.exports?module.exports=a:b.async=a,a.noConflict=function(){return b.async=c,a};var d=function(a,b){if(a.forEach)return a.forEach(b);for(var c=0;c<a.length;c+=1)b(a[c],c,a)},e=function(a,b){if(a.map)return a.map(b);var c=[];return d(a,function(a,d,e){c.push(b(a,d,e))}),c},f=function(a,b,c){return a.reduce?a.reduce(b,c):(d(a,function(a,d,e){c=b(c,a,d,e)}),c)},g=function(a){ [...]
\ No newline at end of file
diff --git a/lib/async.js b/lib/async.js
index 4a51d28..7cc4f5e 100644
--- a/lib/async.js
+++ b/lib/async.js
@@ -400,7 +400,7 @@
             var ready = function () {
                 return _reduce(requires, function (a, x) {
                     return (a && results.hasOwnProperty(x));
-                }, true);
+                }, true) && !results.hasOwnProperty(k);
             };
             if (ready()) {
                 task[task.length - 1](taskCallback, results);
diff --git a/package.json b/package.json
index 5d27e10..39bc4ff 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 , "description": "Higher-order functions and common patterns for asynchronous code"
 , "main": "./index"
 , "author": "Caolan McMahon"
-, "version": "0.1.21"
+, "version": "0.1.22"
 , "repository" :
   { "type" : "git"
   , "url" : "http://github.com/caolan/async.git"
diff --git a/test/test-async.js b/test/test-async.js
index ac45272..52f5536 100644
--- a/test/test-async.js
+++ b/test/test-async.js
@@ -89,10 +89,14 @@ exports['auto'] = function(test){
         task4: ['task1', 'task2', function(callback){
             callOrder.push('task4');
             callback();
+        }],
+        task5: ['task2', function(callback){
+            callOrder.push('task5');
+            callback();
         }]
     },
     function(err){
-        test.same(callOrder, ['task2','task3','task1','task4']);
+        test.same(callOrder, ['task2','task5','task3','task1','task4']);
         test.done();
     });
 };

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-async.git