Fix #23 - incorrect check for callback allowed passing null as a call…

…back to clobber the resolution value.
cujojs · Mar 9, 2012 · 364eafe · 364eafe
1 parent e323bda
commit 364eafe
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/test/cancelable.js b/test/cancelable.js
@@ -38,6 +38,22 @@ buster.testCase('when/cancelable', {
 				done();
 			}
 		);
+	},
+
+	'should propagate the unaltered resolution value': function(done) {
+		var c = cancelable(when.defer(), function() { return false; });
+		c.resolve(true);
+
+		c.then(
+			function(val) {
+				assert(val);
+				done();
+			},
+			function() {
+				buster.fail();
+				done();
+			}
+		);
 
 	}
 });

diff --git a/when.js b/when.js
@@ -110,7 +110,7 @@ define(function() {
 
             var nextValue;
             try {
-                nextValue = callback && callback(value);
+				if(callback) nextValue = callback(value);
                 return promise(nextValue === undef ? value : nextValue);
             } catch(e) {
                 return rejected(e);