Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/caolan/async
Browse files Browse the repository at this point in the history
Pull from upstream. Remake the min.js file.

Conflicts:
	dist/async.min.js
  • Loading branch information
allanca committed Aug 2, 2011
2 parents 010c3a5 + f3aec61 commit 9e116c4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion dist/async.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/async.js
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
},
process: function () {
if (workers < q.concurrency && tasks.length) {
var task = tasks.splice(0, 1)[0];
var task = tasks.shift();
if(q.empty && tasks.length == 0) q.empty();
workers += 1;
worker(task.data, function () {
Expand Down

0 comments on commit 9e116c4

Please sign in to comment.