Revert "Handle error from generator"

This reverts commit 1546728. It doesn't work as expected.
clear-code · Jun 4, 2015 · 33f412a · 33f412a
1 parent 282aed2
commit 33f412a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/modules/utils.js b/modules/utils.js
@@ -1619,7 +1619,7 @@ doIteration : function(aGenerator, aCallbacks)
 			retVal.error = e;
 			retVal.value = true;
 			if (!aCallbacks)
-				throw e;
+				return retVal;
 
 			try {
 				if (aCallbacks.onEnd)
@@ -1638,7 +1638,7 @@ doIteration : function(aGenerator, aCallbacks)
 			retVal.error = e;
 			retVal.value = true;
 			if (!aCallbacks)
-				throw e;
+				return retVal;
 
 			try {
 				if (aCallbacks.onFail)
@@ -1662,7 +1662,7 @@ doIteration : function(aGenerator, aCallbacks)
 			retVal.error = e;
 			retVal.value = true;
 			if (!aCallbacks)
-				throw e;
+				return retVal;
 
 			try {
 				if (aCallbacks.onError)

diff --git a/tests/uxu/unit/modules/utils_misc.test.js b/tests/uxu/unit/modules/utils_misc.test.js
@@ -328,9 +328,9 @@ function test_doIterationWithError()
 	}
 
 	var iterator = TestGenerator();
-	assert.raises(Error, function() {
-		utilsModule.doIteration(iterator);
-	});
+	var retVal = utilsModule.doIteration(iterator);
+	yield 100;
+	assert.isInstanceOf(Error, retVal.error);
 }
 
 function test_doIterationCallbacks()