Fixed expecting exported global functions in chain/paralle.

Ref. https://github.com/cho45/jsdeferred/issues#issue/7
cho45 · Jan 7, 2011 · e193331 · e193331
1 parent 15d1177
commit e193331
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/jsdeferred.jquery.js b/jsdeferred.jquery.js
@@ -122,7 +122,7 @@ Deferred.next = Deferred.next_faster_way_readystatechange ||
                 Deferred.next_default;
 
 Deferred.chain = function () {
-	var chain = next();
+	var chain = Deferred.next();
 	for (var i = 0, len = arguments.length; i < len; i++) (function (obj) {
 		switch (typeof obj) {
 			case "function":
@@ -137,7 +137,7 @@ Deferred.chain = function () {
 				}
 				break;
 			case "object":
-				chain = chain.next(function() { return parallel(obj) });
+				chain = chain.next(function() { return Deferred.parallel(obj) });
 				break;
 			default:
 				throw "unknown type in process chains";
@@ -166,7 +166,7 @@ Deferred.parallel = function (dl) {
 	if (arguments.length > 1) dl = Array.prototype.slice.call(arguments);
 	var ret = new Deferred(), values = {}, num = 0;
 	for (var i in dl) if (dl.hasOwnProperty(i)) (function (d, i) {
-		if (typeof d == "function") d = next(d);
+		if (typeof d == "function") d = Deferred.next(d);
 		d.next(function (v) {
 			values[i] = v;
 			if (--num <= 0) {

diff --git a/jsdeferred.js b/jsdeferred.js
@@ -326,7 +326,7 @@ Deferred.next = Deferred.next_faster_way_readystatechange ||
  * @return {Deferred}
  */
 Deferred.chain = function () {
-	var chain = next();
+	var chain = Deferred.next();
 	for (var i = 0, len = arguments.length; i < len; i++) (function (obj) {
 		switch (typeof obj) {
 			case "function":
@@ -341,7 +341,7 @@ Deferred.chain = function () {
 				}
 				break;
 			case "object":
-				chain = chain.next(function() { return parallel(obj) });
+				chain = chain.next(function() { return Deferred.parallel(obj) });
 				break;
 			default:
 				throw "unknown type in process chains";
@@ -435,7 +435,7 @@ Deferred.parallel = function (dl) {
 	if (arguments.length > 1) dl = Array.prototype.slice.call(arguments);
 	var ret = new Deferred(), values = {}, num = 0;
 	for (var i in dl) if (dl.hasOwnProperty(i)) (function (d, i) {
-		if (typeof d == "function") d = next(d);
+		if (typeof d == "function") d = Deferred.next(d);
 		d.next(function (v) {
 			values[i] = v;
 			if (--num <= 0) {

diff --git a/jsdeferred.nodoc.js b/jsdeferred.nodoc.js
@@ -122,7 +122,7 @@ Deferred.next = Deferred.next_faster_way_readystatechange ||
                 Deferred.next_default;
 
 Deferred.chain = function () {
-	var chain = next();
+	var chain = Deferred.next();
 	for (var i = 0, len = arguments.length; i < len; i++) (function (obj) {
 		switch (typeof obj) {
 			case "function":
@@ -137,7 +137,7 @@ Deferred.chain = function () {
 				}
 				break;
 			case "object":
-				chain = chain.next(function() { return parallel(obj) });
+				chain = chain.next(function() { return Deferred.parallel(obj) });
 				break;
 			default:
 				throw "unknown type in process chains";
@@ -166,7 +166,7 @@ Deferred.parallel = function (dl) {
 	if (arguments.length > 1) dl = Array.prototype.slice.call(arguments);
 	var ret = new Deferred(), values = {}, num = 0;
 	for (var i in dl) if (dl.hasOwnProperty(i)) (function (d, i) {
-		if (typeof d == "function") d = next(d);
+		if (typeof d == "function") d = Deferred.next(d);
 		d.next(function (v) {
 			values[i] = v;
 			if (--num <= 0) {

diff --git a/jsdeferred.userscript.js b/jsdeferred.userscript.js
@@ -125,7 +125,7 @@ Deferred.next = Deferred.next_faster_way_readystatechange ||
                 Deferred.next_default;
 
 Deferred.chain = function () {
-	var chain = next();
+	var chain = Deferred.next();
 	for (var i = 0, len = arguments.length; i < len; i++) (function (obj) {
 		switch (typeof obj) {
 			case "function":
@@ -140,7 +140,7 @@ Deferred.chain = function () {
 				}
 				break;
 			case "object":
-				chain = chain.next(function() { return parallel(obj) });
+				chain = chain.next(function() { return Deferred.parallel(obj) });
 				break;
 			default:
 				throw "unknown type in process chains";
@@ -169,7 +169,7 @@ Deferred.parallel = function (dl) {
 	if (arguments.length > 1) dl = Array.prototype.slice.call(arguments);
 	var ret = new Deferred(), values = {}, num = 0;
 	for (var i in dl) if (dl.hasOwnProperty(i)) (function (d, i) {
-		if (typeof d == "function") d = next(d);
+		if (typeof d == "function") d = Deferred.next(d);
 		d.next(function (v) {
 			values[i] = v;
 			if (--num <= 0) {