feat($ngModelOptions): add new service to support the ngModelOptions directive

Author: petebacondarwin

src/AngularPublic.js

@@ -69,6 +69,7 @@
   $HttpBackendProvider,
   $LocationProvider,
   $LogProvider,
+  $ModelOptionsProvider,
   $ParseProvider,
   $RootScopeProvider,
   $QProvider,
@@ -224,6 +225,7 @@ function publishExternalAPI(angular) {
         $httpBackend: $HttpBackendProvider,
         $location: $LocationProvider,
         $log: $LogProvider,
+        $modelOptions: $ModelOptionsProvider,
         $parse: $ParseProvider,
         $rootScope: $RootScopeProvider,
         $q: $QProvider,

src/ng/directive/input.js

@@ -1145,7 +1145,7 @@ function createDateInputType(type, regexp, parseDate, format) {
   return function dynamicDateInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter) {
     badInputChecker(scope, element, attr, ctrl);
     baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
-    var timezone = ctrl && ctrl.$options && ctrl.$options.timezone;
+    var timezone = ctrl && ctrl.$options.timezone;
     var previousDate;
 
     ctrl.$$parserName = type;

src/ng/directive/ngModel.js

@@ -6,6 +6,7 @@
   DIRTY_CLASS: true,
   UNTOUCHED_CLASS: true,
   TOUCHED_CLASS: true,
+  $ModelOptionsProvider: true,
 */
 
 var VALID_CLASS = 'ng-valid',
@@ -217,8 +218,8 @@ is set to `true`. The parse error is stored in `ngModel.$error.parse`.
  *
  *
  */
-var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate', '$timeout', '$rootScope', '$q', '$interpolate',
-    function($scope, $exceptionHandler, $attr, $element, $parse, $animate, $timeout, $rootScope, $q, $interpolate) {
+var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate', '$timeout', '$rootScope', '$q', '$interpolate', '$modelOptions',
+    function($scope, $exceptionHandler, $attr, $element, $parse, $animate, $timeout, $rootScope, $q, $interpolate, $modelOptions) {
   this.$viewValue = Number.NaN;
   this.$modelValue = Number.NaN;
   this.$$rawModelValue = undefined; // stores the parsed modelValue / model set from scope regardless of validity.
@@ -237,7 +238,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
   this.$$success = {}; // keep valid keys here
   this.$pending = undefined; // keep pending keys here
   this.$name = $interpolate($attr.name || '', false)($scope);
-
+  this.$options = $modelOptions.defaultOptions;
 
   var parsedNgModel = $parse($attr.ngModel),
       parsedNgModelAssign = parsedNgModel.assign,
@@ -246,9 +247,10 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
       pendingDebounce = null,
       ctrl = this;
 
-  this.$$setOptions = function(options) {
-    ctrl.$options = options;
-    if (options && options.getterSetter) {
+
+  this.$$initGetterSetters = function() {
+
+    if (ctrl.$options.getterSetter) {
       var invokeModelGetter = $parse($attr.ngModel + '()'),
           invokeModelSetter = $parse($attr.ngModel + '($$$p)');
 
@@ -272,6 +274,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
     }
   };
 
+
   /**
    * @ngdoc method
    * @name ngModel.NgModelController#$render
@@ -523,7 +526,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
     var prevValid = ctrl.$valid;
     var prevModelValue = ctrl.$modelValue;
 
-    var allowInvalid = ctrl.$options && ctrl.$options.allowInvalid;
+    var allowInvalid = ctrl.$options.allowInvalid;
 
     ctrl.$$runValidators(parserValid, modelValue, viewValue, function(allValid) {
       // If there was no change in validity, don't update the model
@@ -683,7 +686,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
       ctrl.$modelValue = ngModelGet($scope);
     }
     var prevModelValue = ctrl.$modelValue;
-    var allowInvalid = ctrl.$options && ctrl.$options.allowInvalid;
+    var allowInvalid = ctrl.$options.allowInvalid;
     ctrl.$$rawModelValue = modelValue;
 
     if (allowInvalid) {
@@ -764,7 +767,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
    */
   this.$setViewValue = function(value, trigger) {
     ctrl.$viewValue = value;
-    if (!ctrl.$options || ctrl.$options.updateOnDefault) {
+    if (ctrl.$options.updateOnDefault) {
       ctrl.$$debounceViewValueCommit(trigger);
     }
   };
@@ -774,7 +777,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
         options = ctrl.$options,
         debounce;
 
-    if (options && isDefined(options.debounce)) {
+    if (isDefined(options.debounce)) {
       debounce = options.debounce;
       if (isNumber(debounce)) {
         debounceDelay = debounce;
@@ -1016,7 +1019,11 @@ var ngModelDirective = ['$rootScope', function($rootScope) {
           var modelCtrl = ctrls[0],
               formCtrl = ctrls[1] || nullFormCtrl;
 
-          modelCtrl.$$setOptions(ctrls[2] && ctrls[2].$options);
+          if (ctrls[2]) {
+            modelCtrl.$options = ctrls[2].$options;
+          }
+
+          modelCtrl.$$initGetterSetters();
 
           // notify others, especially parent forms
           formCtrl.$addControl(modelCtrl);
@@ -1033,7 +1040,7 @@ var ngModelDirective = ['$rootScope', function($rootScope) {
         },
         post: function ngModelPostLink(scope, element, attr, ctrls) {
           var modelCtrl = ctrls[0];
-          if (modelCtrl.$options && modelCtrl.$options.updateOn) {
+          if (modelCtrl.$options.updateOn) {
             element.on(modelCtrl.$options.updateOn, function(ev) {
               modelCtrl.$$debounceViewValueCommit(ev && ev.type);
             });
@@ -1396,3 +1403,45 @@ function isObjectEmpty(obj) {
   }
   return true;
 }
+
+
+
+/**
+ * @ngdoc service
+ * @name $modelOptions
+ * @description
+ * This service provides support to the ngModelOptions directive.
+ *
+ * You can register default options that are used application wide if no ngModelOptions
+ * directive is found.
+ *
+ * You can register model adaptors that can selected by ngModelOptions settings to modify
+ * the behavior of ngModel, form and input directives.
+ */
+function $ModelOptionsProvider() {
+  return {
+    $get: function() {
+      return {
+        /**
+         * @ngdoc property
+         * @name $modelOptions#defaultOptions
+         * @type {Object}
+         * @description
+         * The default options to fall back on when there are no more ngModelOption
+         * directives as ancestors
+         */
+        defaultOptions: {
+          updateOnDefault: true
+        },
+        /**
+         * @ngdoc property
+         * @name $modelOptions#modelAdaptors
+         * @type {Object<string, Function>}
+         * @description
+         * The functions that adapt the behaviour of ngModel
+         */
+        modelAdaptors: {}
+      };
+    }
+  };
+};