simplified ReturnValue

canjs · Jan 24, 2017 · 5aa7e69 · 5aa7e69
1 parent 5c00ac4
commit 5aa7e69
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/can-construct.js b/can-construct.js
@@ -285,7 +285,7 @@ assign(Construct, {
 			});
 			args = inst.setup.apply(inst, arguments);
 			if (args instanceof Construct.ReturnValue){
-				return args.initCb.apply(null, args.args);
+				return args.value;
 			}
 			inst.__inSetup = false;
 		}
@@ -667,9 +667,8 @@ assign(Construct, {
 		 * ```
 		 */
 	},
-	ReturnValue: function(cb, args){
-		this.initCb = cb;
-		this.args = args;
+	ReturnValue: function(value){
+		this.value = value;
 	}
 });
 /**

diff --git a/can-construct_test.js b/can-construct_test.js
@@ -230,9 +230,7 @@ QUnit.test("return alternative value simple", function(){
 	var Alternative = function(){};
 	var Base = Construct.extend({
 		setup: function(){
-			return new Construct.ReturnValue(function(){
-				return new Alternative();
-			});
+			return new Construct.ReturnValue( new Alternative() );
 		}
 	});
 	QUnit.ok(new Base() instanceof Alternative, "Should create an instance of Alternative");
@@ -249,9 +247,7 @@ QUnit.test("return alternative value on setup (full case)", function(){
 			console.log('[Person.setup]');
 			if (opts.age >= 16){
 				console.log('[Person.setup] >= 16');
-				return new Construct.ReturnValue(function(params){
-					return new Student(params.name, params.school);
-				}, [opts]);
+				return new Construct.ReturnValue( new Student(opts.name, opts.school) );
 			}
 			console.log('[Person.setup] < 16');
 			opts.isStudent = false;