remove support for ngMin / ngMax

Author: Narretz

src/ng/directive/input.js

@@ -1061,23 +1061,18 @@ var inputType = {
    * Angular will also update the model value.
    *
    * Automatic value adjustment also means that a range input element can never have the `required`,
-   * `min`, or `max` errors, except when using `ngMax` and `ngMin`, which are not affected by automatic
-   * value adjustment, because they do not set the `min` and `max` attributes.
+   * `min`, or `max` errors.
+   *
+   * Note that `input[range]` is not compatible with`ngMax` and `ngMin`, because they do not set the
+   * `min` and `max` attributes, which means that the browser won't automatically adjust the input
+   * value based on their values, and will always assume min = 0 and max = 100.
    *
    * @param {string}  ngModel Assignable angular expression to data-bind to.
    * @param {string=} name Property name of the form under which the control is published.
    * @param {string=} min Sets the `min` validation to ensure that the value entered is greater
    *                  than `min`. Can be interpolated.
    * @param {string=} max Sets the `max` validation to ensure that the value entered is less than `max`.
    *                  Can be interpolated.
-   * @param {string=} ngMin Takes an expression. Sets the `min` validation to ensure that the value
-   *                  entered is greater than `min`. Does not set the `min` attribute and therefore
-   *                  adds no native HTML5 validation. It also means the browser won't adjust the
-   *                  element value in case `min` is greater than the current value.
-   * @param {string=} ngMax Takes an expression. Sets the `max` validation to ensure that the value
-   *                  entered is less than `max`. Does not set the `max` attribute and therefore
-   *                  adds no native HTML5 validation. It also means the browser won't adjust the
-   *                  element value in case `max` is less than the current value.
    * @param {string=} ngChange Angular expression to be executed when the ngModel value changes due
    *                  to user interaction with the input element.
    *
@@ -1551,8 +1546,8 @@ function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) {
       minVal = supportsRange ? 0 : undefined,
       maxVal = supportsRange ? 100 : undefined,
       validity = element[0].validity,
-      minAttrType = isDefined(attr.ngMin) ? 'ngMin' : isDefined(attr.min) ? 'min' : false,
-      maxAttrType = isDefined(attr.ngMax) ? 'ngMax' : isDefined(attr.max) ? 'max' : false;
+      hasMinAttr = isDefined(attr.min),
+      hasMaxAttr = isDefined(attr.max);
 
   var originalRender = ctrl.$render;
 
@@ -1565,38 +1560,35 @@ function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) {
     } :
     originalRender;
 
-  if (minAttrType) {
-    ctrl.$validators.min = minAttrType === 'min' && supportsRange ?
+  if (hasMinAttr) {
+    ctrl.$validators.min = supportsRange ?
       // Since all browsers set the input to a valid value, we don't need to check validity
       function noopMinValidator() { return true; } :
-      // ngMin doesn't set the min attr, so the browser doesn't adjust the input value as setting min would
+      // non-support browsers validate the range
       function minValidator(modelValue, viewValue) {
         return ctrl.$isEmpty(viewValue) || isUndefined(minVal) || viewValue >= minVal;
       };
 
-    setInitialValueAndObserver(minAttrType, 'min', minChange);
+    setInitialValueAndObserver('min', minChange);
   }
 
-  if (maxAttrType) {
-    ctrl.$validators.max = maxAttrType === 'max' && supportsRange ?
+  if (hasMaxAttr) {
+    ctrl.$validators.max = supportsRange ?
       // Since all browsers set the input to a valid value, we don't need to check validity
       function noopMaxValidator() { return true; } :
       // ngMax doesn't set the max attr, so the browser doesn't adjust the input value as setting max would
       function maxValidator(modelValue, viewValue) {
         return ctrl.$isEmpty(viewValue) || isUndefined(maxVal) || viewValue <= maxVal;
       };
 
-    setInitialValueAndObserver(maxAttrType, 'max', maxChange);
+    setInitialValueAndObserver('max', maxChange);
   }
 
-  function setInitialValueAndObserver(actualAttrName, htmlAttrName, changeFn) {
-    // e.g. max === max
-    if (actualAttrName === htmlAttrName) {
-      // interpolated attributes set the attribute value only after a digest, but we need the
-      // attribute value when the input is first rendered, so that the browser can adjust the
-      // input value based on the min/max value
-      element.attr(htmlAttrName, attr[htmlAttrName]);
-    }
+  function setInitialValueAndObserver(htmlAttrName, changeFn) {
+    // interpolated attributes set the attribute value only after a digest, but we need the
+    // attribute value when the input is first rendered, so that the browser can adjust the
+    // input value based on the min/max value
+    element.attr(htmlAttrName, attr[htmlAttrName]);
 
     attr.$observe(htmlAttrName, changeFn);
   }
@@ -1611,7 +1603,7 @@ function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) {
       return;
     }
 
-    if (supportsRange && minAttrType === 'min') {
+    if (supportsRange) {
       var elVal = element.val();
       // IE11 doesn't set the el val correctly if the minVal is greater than the element value
       if (minVal > elVal) {
@@ -1635,7 +1627,7 @@ function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) {
       return;
     }
 
-    if (supportsRange && maxAttrType === 'max') {
+    if (supportsRange) {
       var elVal = element.val();
       // IE11 doesn't set the el val correctly if the maxVal is less than the element value
       if (maxVal < elVal) {

test/ng/directive/inputSpec.js

@@ -3105,49 +3105,6 @@ describe('input', function() {
       }
     });
 
-    describe('ngMin', function() {
-
-      it('should validate', function() {
-        var inputElm = helper.compileInput('<input type="range" ng-model="value" name="alias" ng-min="50" />');
-
-        helper.changeInputValueTo('1');
-        expect(inputElm).toBeInvalid();
-        expect(scope.value).toBeFalsy();
-        expect(scope.form.alias.$error.min).toBeTruthy();
-
-        helper.changeInputValueTo('100');
-        expect(inputElm).toBeValid();
-        expect(scope.value).toBe(100);
-        expect(scope.form.alias.$error.min).toBeFalsy();
-      });
-
-      it('should validate even if the ngMin value changes on-the-fly', function() {
-        scope.min = 10;
-        var inputElm = helper.compileInput('<input type="range" ng-model="value" name="alias" ng-min="min" />');
-
-        helper.changeInputValueTo('15');
-        expect(inputElm).toBeValid();
-
-        scope.min = 20;
-        scope.$digest();
-        expect(inputElm).toBeInvalid();
-        expect(inputElm.val()).toBe('15');
-
-        scope.min = null;
-        scope.$digest();
-        expect(inputElm).toBeValid();
-
-        scope.min = '20';
-        scope.$digest();
-        expect(inputElm).toBeInvalid();
-
-        scope.min = 'abc';
-        scope.$digest();
-        expect(inputElm).toBeValid();
-      });
-    });
-
-
     describe('max', function() {
 
       if (supportsRange) {
@@ -3303,48 +3260,6 @@ describe('input', function() {
       }
     });
 
-    describe('ngMax', function() {
-
-      it('should validate', function() {
-        var inputElm = helper.compileInput('<input type="range" ng-model="value" name="alias" ng-max="5" />');
-
-        helper.changeInputValueTo('20');
-        expect(inputElm).toBeInvalid();
-        expect(scope.value).toBeUndefined();
-        expect(scope.form.alias.$error.max).toBeTruthy();
-
-        helper.changeInputValueTo('0');
-        expect(inputElm).toBeValid();
-        expect(scope.value).toBe(0);
-        expect(scope.form.alias.$error.max).toBeFalsy();
-      });
-
-      it('should validate even if the ngMax value changes on-the-fly', function() {
-        scope.max = 10;
-        var inputElm = helper.compileInput('<input type="range" ng-model="value" name="alias" ng-max="max" />');
-
-        helper.changeInputValueTo('5');
-        expect(inputElm).toBeValid();
-
-        scope.max = 0;
-        scope.$digest();
-        expect(inputElm).toBeInvalid();
-
-        scope.max = null;
-        scope.$digest();
-        expect(inputElm).toBeValid();
-
-        scope.max = '4';
-        scope.$digest();
-        expect(inputElm).toBeInvalid();
-
-        scope.max = 'abc';
-        scope.$digest();
-        expect(inputElm).toBeValid();
-      });
-
-    });
-
     if (supportsRange) {
 
       describe('min and max', function() {