Backporting stache binding fix for special values. #2370 (#2481)

* Backporting stache binding fix for special values. #2370 * Fix git merge conflict
canjs · Sep 15, 2016 · 5a82dcf · 5a82dcf
1 parent c75da90
commit 5a82dcf
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 60 deletions.
diff --git a/view/bindings/bindings.js b/view/bindings/bindings.js
@@ -259,17 +259,36 @@ steal("can/util",
 						expr = new expression.Call(expr, defaultArgs, {} );
 					}
 
+					// make a scope with these things just under
+
+					var localScope = data.scope.add({
+						"@element": $el,
+						"@event": ev,
+						"@viewModel": viewModel,
+						"@scope": data.scope,
+						"@context": data.scope._context,
+
+						"%element": this,
+						"$element": $el,
+						"%event": ev,
+						"%viewModel": viewModel,
+						"%scope": data.scope,
+						"%context": data.scope._context
+					},{
+						notContext: true
+					});
+
 					// We grab the first item and treat it as a method that
 					// we'll call.
-					var scopeData = data.scope.read(expr.methodExpr.key, {
+					var scopeData = localScope.read(expr.methodExpr.key, {
 						isArgument: true
 					});
 
 					// We break out early if the first argument isn't available
 					// anywhere.
 
 					if (!scopeData.value) {
-						scopeData = data.scope.read(expr.methodExpr.key, {
+						scopeData = localScope.read(expr.methodExpr.key, {
 							isArgument: true
 						});
 
@@ -282,28 +301,7 @@ steal("can/util",
 
 						return null;
 					}
-
-
-
-					// make a scope with these things just under
-
-					var localScope = data.scope.add({
-						"@element": $el,
-						"@event": ev,
-						"@viewModel": viewModel,
-						"@scope": data.scope,
-						"@context": data.scope._context,
-
-						"%element": this,
-						"$element": $el,
-						"%event": ev,
-						"%viewModel": viewModel,
-						"%scope": data.scope,
-						"%context": data.scope._context
-					},{
-						notContext: true
-					});
-
+
 					var args = expr.args(localScope, null)();
 
 

diff --git a/view/bindings/bindings_test.js b/view/bindings/bindings_test.js
@@ -1978,42 +1978,42 @@ steal("can/view/bindings", "can/map", "can/test", "can/component", "can/view/mus
 	});
 
 	test('previously non-existing select value gets selected from a list when it is added (#1762)', function() {
-	  var template = can.view.stache('<select {($value)}="{person}">' +
-	      '<option></option>' +
-	      '{{#each people}}<option value="{{.}}">{{.}}</option>{{/each}}' +
-	    '</select>' +
-	    '<input type="text" size="5" {($value)}="person">'
-	  );
-
-	  var people = new can.List([
-	    "Alexis",
-	    "Mihael",
-	    "Curtis",
-	    "David"
-	  ]);
-
-	  var vm = new can.Map({
-	    person: 'Brian',
-	    people: people
-	  });
-
-	  stop();
-	  vm.bind('person', function(ev, newVal, oldVal) {
-	    ok(false, 'person attribute should not change');
-	  });
-
-	  var frag = template(vm);
-
-	  equal(vm.attr('person'), 'Brian', 'Person is still set');
-
-	  setTimeout(function() {
-	    people.push('Brian');
-	    setTimeout(function() {
-	      var select = frag.firstChild;
-	      ok(select.lastChild.selected, 'New child should be selected');
-	      start();
-	    }, 20);
-	  }, 20);
+		var template = can.view.stache('<select {($value)}="{person}">' +
+				'<option></option>' +
+				'{{#each people}}<option value="{{.}}">{{.}}</option>{{/each}}' +
+			'</select>' +
+			'<input type="text" size="5" {($value)}="person">'
+		);
+
+		var people = new can.List([
+			"Alexis",
+			"Mihael",
+			"Curtis",
+			"David"
+		]);
+
+		var vm = new can.Map({
+			person: 'Brian',
+			people: people
+		});
+
+		stop();
+		vm.bind('person', function(ev, newVal, oldVal) {
+			ok(false, 'person attribute should not change');
+		});
+
+		var frag = template(vm);
+
+		equal(vm.attr('person'), 'Brian', 'Person is still set');
+
+		setTimeout(function() {
+			people.push('Brian');
+			setTimeout(function() {
+				var select = frag.firstChild;
+				ok(select.lastChild.selected, 'New child should be selected');
+				start();
+			}, 20);
+		}, 20);
 	});
 
 	test("one-way <select> bindings keep value if options are replaced (#1762)", function(){
@@ -2395,4 +2395,24 @@ steal("can/view/bindings", "can/map", "can/test", "can/component", "can/view/mus
 		ok(vm.attr("compute").isComputed, "Back to being a compute");
 	});
 
+	test("special values get called", function(assert) {
+		expect(1);
+		stop();
+
+		can.Component.extend({
+			tag: 'ref-syntax',
+			viewModel: new can.Map({
+				method: function() {
+					assert.ok(true, "method called");
+					start();
+				}
+			})
+		});
+
+		can.append(
+			can.$("#qunit-fixture"),
+			can.stache("<ref-syntax ($inserted)=\"%viewModel.method()\">" +
+							"</ref-syntax>")({})
+		);
+	});
 });