fix(ngModel): execute getter/setter models with context

Author: jbedard

src/ng/directive/input.js

@@ -1715,33 +1715,22 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
   this.$name = $interpolate($attr.name || '', false)($scope);
 
 
-  var parsedNgModel = $parse($attr.ngModel),
-      pendingDebounce = null,
+  var pendingDebounce = null,
       ctrl = this;
 
-  var ngModelGet = function ngModelGet() {
-    var modelValue = parsedNgModel($scope);
-    if (ctrl.$options && ctrl.$options.getterSetter && isFunction(modelValue)) {
-      modelValue = modelValue();
-    }
-    return modelValue;
-  };
-
-  var ngModelSet = function ngModelSet(newValue) {
-    var getterSetter;
-    if (ctrl.$options && ctrl.$options.getterSetter &&
-        isFunction(getterSetter = parsedNgModel($scope))) {
-
-      getterSetter(ctrl.$modelValue);
-    } else {
-      parsedNgModel.assign($scope, ctrl.$modelValue);
-    }
-  };
+  var ngModelGet = $parse($attr.ngModel);
+  var ngModelSet = ngModelGet.assign;
 
   this.$$setOptions = function(options) {
     ctrl.$options = options;
 
-    if (!parsedNgModel.assign && (!options || !options.getterSetter)) {
+    if (options && options.getterSetter) {
+      ngModelGet = $parse($attr.ngModel + "()");
+      var ngModelSetInvoke = $parse($attr.ngModel + "($$ngModelValue)");
+      ngModelSet = function($scope, value) {
+        ngModelSetInvoke($scope, {$$ngModelValue: value});
+      };
+    } else if (!ngModelSet) {
       throw $ngModelMinErr('nonassign', "Expression '{0}' is non-assignable. Element: {1}",
           $attr.ngModel, startingTag($element));
     }
@@ -2103,7 +2092,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
     }
     if (isNumber(ctrl.$modelValue) && isNaN(ctrl.$modelValue)) {
       // ctrl.$modelValue has not been touched yet...
-      ctrl.$modelValue = ngModelGet();
+      ctrl.$modelValue = ngModelGet($scope);
     }
     var prevModelValue = ctrl.$modelValue;
     var allowInvalid = ctrl.$options && ctrl.$options.allowInvalid;
@@ -2130,7 +2119,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
   };
 
   this.$$writeModelToScope = function() {
-    ngModelSet(ctrl.$modelValue);
+    ngModelSet($scope, ctrl.$modelValue);
     forEach(ctrl.$viewChangeListeners, function(listener) {
       try {
         listener();
@@ -2226,7 +2215,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
   //       ng-change executes in apply phase
   // 4. view should be changed back to 'a'
   $scope.$watch(function ngModelWatch() {
-    var modelValue = ngModelGet();
+    var modelValue = ngModelGet($scope);
 
     // if scope model value and ngModel value are out of sync
     // TODO(perf): why not move this to the action fn?

test/ng/directive/inputSpec.js

@@ -1957,10 +1957,10 @@ describe('input', function() {
       expect(spy).toHaveBeenCalledWith('a');
       expect(scope.name).toBe(spy);
 
-      scope.name = 'c';
+      scope.name = null;
       changeInputValueTo('d');
-      expect(inputElm.val()).toBe('d');
-      expect(scope.name).toBe('d');
+      expect(inputElm.val()).toBe('');
+      expect(scope.name).toBe(null);
     });
 
     it('should fail on non-assignable model binding if getterSetter is false', function() {