refactor(ngModelOptions): internal variables do not start with a $

Author: petebacondarwin

src/ng/directive/ngModel.js

@@ -9,7 +9,7 @@
   PENDING_CLASS: true,
   addSetValidityMethod: true,
   setupValidity: true,
-  $defaultModelOptions: false
+  defaultModelOptions: false
 */
 
 
@@ -245,7 +245,7 @@ function NgModelController($scope, $exceptionHandler, $attr, $element, $parse, $
   this.$pending = undefined; // keep pending keys here
   this.$name = $interpolate($attr.name || '', false)($scope);
   this.$$parentForm = nullFormCtrl;
-  this.$options = $defaultModelOptions;
+  this.$options = defaultModelOptions;
 
   this.$$parsedNgModel = $parse($attr.ngModel);
   this.$$parsedNgModelAssign = this.$$parsedNgModel.assign;

src/ng/directive/ngModelOptions.js

@@ -1,7 +1,7 @@
 'use strict';
 
-/* exported $defaultModelOptions */
-var $defaultModelOptions;
+/* exported defaultModelOptions */
+var defaultModelOptions;
 var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
 
 /**
@@ -72,14 +72,14 @@ ModelOptions.prototype = {
     }
 
     // Finally add in any missing defaults
-    defaults(options, $defaultModelOptions.$$options);
+    defaults(options, defaultModelOptions.$$options);
 
     return new ModelOptions(options);
   }
 };
 
 
-$defaultModelOptions = new ModelOptions({
+defaultModelOptions = new ModelOptions({
   updateOn: '',
   updateOnDefault: true,
   debounce: 0,
@@ -335,7 +335,7 @@ var ngModelOptionsDirective = function() {
     link: {
       pre: function ngModelOptionsPreLinkFn(scope, element, attrs, ctrls) {
         var optionsCtrl = ctrls[0];
-        var parentOptions = ctrls[1] ? ctrls[1].$options : $defaultModelOptions;
+        var parentOptions = ctrls[1] ? ctrls[1].$options : defaultModelOptions;
         optionsCtrl.$options = parentOptions.createChild(scope.$eval(attrs.ngModelOptions));
       }
     }

test/ng/directive/ngModelOptionsSpec.js

@@ -2,18 +2,18 @@
 
 /* globals
     generateInputCompilerHelper: false,
-    $defaultModelOptions: false
+    defaultModelOptions: false
  */
 describe('ngModelOptions', function() {
 
-  describe('$defaultModelOptions', function() {
+  describe('defaultModelOptions', function() {
     it('should provide default values', function() {
-      expect($defaultModelOptions.getOption('updateOn')).toEqual('');
-      expect($defaultModelOptions.getOption('updateOnDefault')).toEqual(true);
-      expect($defaultModelOptions.getOption('debounce')).toBe(0);
-      expect($defaultModelOptions.getOption('getterSetter')).toBe(false);
-      expect($defaultModelOptions.getOption('allowInvalid')).toBe(false);
-      expect($defaultModelOptions.getOption('timezone')).toBe(null);
+      expect(defaultModelOptions.getOption('updateOn')).toEqual('');
+      expect(defaultModelOptions.getOption('updateOnDefault')).toEqual(true);
+      expect(defaultModelOptions.getOption('debounce')).toBe(0);
+      expect(defaultModelOptions.getOption('getterSetter')).toBe(false);
+      expect(defaultModelOptions.getOption('allowInvalid')).toBe(false);
+      expect(defaultModelOptions.getOption('timezone')).toBe(null);
     });
   });
 
@@ -31,18 +31,18 @@ describe('ngModelOptions', function() {
     }));
 
 
-    describe('should fall back to `$defaultModelOptions`', function() {
+    describe('should fall back to `defaultModelOptions`', function() {
       it('if there is no `ngModelOptions` directive', function() {
         var inputElm = helper.compileInput(
             '<input type="text" ng-model="name" name="alias" />');
 
         var inputOptions = $rootScope.form.alias.$options;
-        expect(inputOptions.getOption('updateOn')).toEqual($defaultModelOptions.getOption('updateOn'));
-        expect(inputOptions.getOption('updateOnDefault')).toEqual($defaultModelOptions.getOption('updateOnDefault'));
-        expect(inputOptions.getOption('debounce')).toEqual($defaultModelOptions.getOption('debounce'));
-        expect(inputOptions.getOption('getterSetter')).toEqual($defaultModelOptions.getOption('getterSetter'));
-        expect(inputOptions.getOption('allowInvalid')).toEqual($defaultModelOptions.getOption('allowInvalid'));
-        expect(inputOptions.getOption('timezone')).toEqual($defaultModelOptions.getOption('timezone'));
+        expect(inputOptions.getOption('updateOn')).toEqual(defaultModelOptions.getOption('updateOn'));
+        expect(inputOptions.getOption('updateOnDefault')).toEqual(defaultModelOptions.getOption('updateOnDefault'));
+        expect(inputOptions.getOption('debounce')).toEqual(defaultModelOptions.getOption('debounce'));
+        expect(inputOptions.getOption('getterSetter')).toEqual(defaultModelOptions.getOption('getterSetter'));
+        expect(inputOptions.getOption('allowInvalid')).toEqual(defaultModelOptions.getOption('allowInvalid'));
+        expect(inputOptions.getOption('timezone')).toEqual(defaultModelOptions.getOption('timezone'));
       });
 
 
@@ -51,9 +51,9 @@ describe('ngModelOptions', function() {
             '<input type="text" ng-model="name" name="alias" ng-model-options="{ updateOn: \'blur\' }"/>');
 
         var inputOptions = $rootScope.form.alias.$options;
-        expect(inputOptions.getOption('debounce')).toEqual($defaultModelOptions.getOption('debounce'));
+        expect(inputOptions.getOption('debounce')).toEqual(defaultModelOptions.getOption('debounce'));
         expect(inputOptions.getOption('updateOnDefault')).toBe(false);
-        expect(inputOptions.getOption('updateOnDefault')).not.toEqual($defaultModelOptions.getOption('updateOnDefault'));
+        expect(inputOptions.getOption('updateOnDefault')).not.toEqual(defaultModelOptions.getOption('updateOnDefault'));
       });
 
 
@@ -63,9 +63,9 @@ describe('ngModelOptions', function() {
                                 '</form>')($rootScope);
         var inputOptions = $rootScope.form.alias.$options;
 
-        expect(inputOptions.getOption('debounce')).toEqual($defaultModelOptions.getOption('debounce'));
+        expect(inputOptions.getOption('debounce')).toEqual(defaultModelOptions.getOption('debounce'));
         expect(inputOptions.getOption('updateOnDefault')).toBe(false);
-        expect(inputOptions.getOption('updateOnDefault')).not.toEqual($defaultModelOptions.getOption('updateOnDefault'));
+        expect(inputOptions.getOption('updateOnDefault')).not.toEqual(defaultModelOptions.getOption('updateOnDefault'));
         dealoc(form);
       });
     });