refactor(forms): Rename read() -> setViewValue()

vojtajina · vojtajina · commit 83314913e717 · 2012-03-09T17:33:22.000-08:00
diff --git a/src/directive/input.js b/src/directive/input.js
@@ -374,7 +374,7 @@ function textInputType(scope, element, attr, ctrl) {
 
     if (ctrl.viewValue !== value) {
       scope.$apply(function() {
-        ctrl.read(value);
+        ctrl.setViewValue(value);
       });
     } else if (touched) {
       scope.$apply();
@@ -559,7 +559,7 @@ function radioInputType(scope, element, attr, ctrl) {
     if (element[0].checked) {
       scope.$apply(function() {
         ctrl.touch();
-        ctrl.read(attr.value);
+        ctrl.setViewValue(attr.value);
       });
     };
   });
@@ -580,7 +580,7 @@ function checkboxInputType(scope, element, attr, ctrl) {
   element.bind('click', function() {
     scope.$apply(function() {
       ctrl.touch();
-      ctrl.read(element[0].checked);
+      ctrl.setViewValue(element[0].checked);
     });
   });
 
@@ -830,7 +830,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', 'ngModel',
 
   /**
    * @ngdoc function
-   * @name angular.module.ng.$compileProvider.directive.ng-model.NgModelController#read
+   * @name angular.module.ng.$compileProvider.directive.ng-model.NgModelController#setViewValue
    * @methodOf angular.module.ng.$compileProvider.directive.ng-model.NgModelController
    *
    * @description
@@ -845,7 +845,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', 'ngModel',
    *
    * @param {string} value Value from the view
    */
-  this.read = function(value) {
+  this.setViewValue = function(value) {
     this.viewValue = value;
 
     forEach(this.parsers, function(fn) {
@@ -1042,7 +1042,7 @@ var ngModelInstantDirective = ['$browser', function($browser) {
 
           if (ctrl.viewValue !== value) {
             scope.$apply(function() {
-              ctrl.read(value);
+              ctrl.setViewValue(value);
             });
           } else if (touched) {
             scope.$apply();
diff --git a/src/directive/select.js b/src/directive/select.js
@@ -168,7 +168,7 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
         selectElement.bind('change', function() {
           scope.$apply(function() {
             ctrl.touch();
-            ctrl.read(selectElement.val());
+            ctrl.setViewValue(selectElement.val());
           });
         });
       }
@@ -190,7 +190,7 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
               }
             });
             ctrl.touch();
-            ctrl.read(array);
+            ctrl.setViewValue(array);
           });
         });
       }
@@ -270,7 +270,7 @@ var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
             ctrl.touch();
 
             if (ctrl.viewValue !== value) {
-              ctrl.read(value);
+              ctrl.setViewValue(value);
             }
           });
         });
diff --git a/test/directive/inputSpec.js b/test/directive/inputSpec.js
@@ -113,7 +113,7 @@ describe('NgModelController', function() {
   describe('view -> model', function() {
 
     it('should set the value to $viewValue', function() {
-      ctrl.read('some-val');
+      ctrl.setViewValue('some-val');
       expect(ctrl.viewValue).toBe('some-val');
     });
 
@@ -131,7 +131,7 @@ describe('NgModelController', function() {
         return value + '-b';
       });
 
-      ctrl.read('init');
+      ctrl.setViewValue('init');
       expect(log).toEqual(['init', 'init-a']);
       expect(ctrl.modelValue).toBe('init-a-b');
     });
@@ -141,13 +141,13 @@ describe('NgModelController', function() {
       var spy = jasmine.createSpy('$viewChange');
       scope.$on('$viewChange', spy);
 
-      ctrl.read('val');
+      ctrl.setViewValue('val');
       expect(spy).toHaveBeenCalledOnce();
       spy.reset();
 
       // invalid
       ctrl.parsers.push(function() {return undefined;});
-      ctrl.read('val');
+      ctrl.setViewValue('val');
       expect(spy).not.toHaveBeenCalled();
     });
   });

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {`
`168`	`168`	`selectElement.bind('change', function() {`
`169`	`169`	`scope.$apply(function() {`
`170`	`170`	`ctrl.touch();`
`171`		`- ctrl.read(selectElement.val());`
	`171`	`+ ctrl.setViewValue(selectElement.val());`
`172`	`172`	`});`
`173`	`173`	`});`
`174`	`174`	`}`
`@@ -190,7 +190,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {`
`190`	`190`	`}`
`191`	`191`	`});`
`192`	`192`	`ctrl.touch();`
`193`		`- ctrl.read(array);`
	`193`	`+ ctrl.setViewValue(array);`
`194`	`194`	`});`
`195`	`195`	`});`
`196`	`196`	`}`
`@@ -270,7 +270,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {`
`270`	`270`	`ctrl.touch();`
`271`	`271`
`272`	`272`	`if (ctrl.viewValue !== value) {`
`273`		`- ctrl.read(value);`
	`273`	`+ ctrl.setViewValue(value);`
`274`	`274`	`}`
`275`	`275`	`});`
`276`	`276`	`});`