Merge remote-tracking branch 'origin/master'

stephenmathieson · stephenmathieson · commit ce3b3c613beb · 2015-02-23T22:17:54.000-05:00
Conflicts:
	component.json
diff --git a/component.json b/component.json
@@ -7,5 +7,8 @@
   "scripts": [
     "index.js"
   ],
-  "license": "MIT"
+  "license": "MIT",
+  "development": {
+    "component/assert": "*"
+  }
 }
diff --git a/index.js b/index.js
@@ -14,11 +14,11 @@ module.exports = function parallel(fns, context, callback) {
   var finished = false
   var results = new Array(pending)
 
-  fns.forEach(context ? function (fn, i) {
+
+  for (var i = 0, l = fns.length; i < l; i++) {
+    var fn = fns[i]
     fn.call(context, maybeDone(i))
-  } : function (fn, i) {
-    fn(maybeDone(i))
-  })
+  }
 
   function maybeDone(i) {
     return function (err, result) {
diff --git a/test.html b/test.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset='utf8'>
+    <title>array-parallel tests</title>
+  </head>
+  <body>
+    <script src='build/build.js'></script>
+    <script src='test.js'></script>
+  </body>
+</html>
diff --git a/test.js b/test.js
@@ -1,5 +1,9 @@
 var assert = require('assert')
-var parallel = require('./')
+try {
+  var parallel = require('array-parallel')
+} catch (e) {
+  var parallel = require('./')
+}
 
 var a, b, c
 parallel([
@@ -57,6 +61,6 @@ parallel([function (done) {
   done()
 }])
 
-process.nextTick(function () {
+setTimeout(function () {
   assert.equal(f, true)
-})
+})
