address gkalpak's comments

Author: Narretz

karma-shared.conf.js

@@ -17,7 +17,7 @@ module.exports = function(config, specificOptions) {
       testName: specificOptions.testName || 'AngularJS',
       startConnect: true,
       options: {
-        // We need selenium version +2.46 for 'Firefox' 39 and the last selenium version for OS X is 2.45.
+        // We need selenium version +2.46 for Firefox 39 and the last selenium version for OS X is 2.45.
         // TODO: Uncomment when there is a selenium 2.46 available for OS X.
         // 'selenium-version': '2.46.0'
       }

src/ng/directive/input.js

@@ -1054,8 +1054,8 @@ var inputType = {
    * Since the element value should always reflect the current model value, a range input
    * will set the bound ngModel expression to the value that the browser has set for the
    * input element. For example, in the following input `<input type="range" ng-model="model.value">`,
-   * if I set `model.value = null`, the browser will set the input to `'50'`. Angular will then set
-   * the model to `50`, to prevent input and model value being out of sync.
+   * if the application sets `model.value = null`, the browser will set the input to `'50'`.
+   * Angular will then set the model to `50`, to prevent input and model value being out of sync.
    *
    * This does not only affect changes to the model value, but also to the values of the `min` and
    * `max` attributes. When these change in a way that will cause the browser to modify the input value,
@@ -1076,7 +1076,7 @@ var inputType = {
    *                  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 `min` attribute and therefore
+   *                  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
@@ -1085,25 +1085,24 @@ var inputType = {
    * @example
       <example name="range-input-directive" module="rangeExample">
         <file name="index.html">
-         <script>
-           angular.module('rangeExample', [])
-             .controller('ExampleController', ['$scope', function($scope) {
-               $scope.value = 75;
-               $scope.min = 10;
-               $scope.max = 90;
-             }]);
-         </script>
-         <form name="myForm" ng-controller="ExampleController">
-
-           Model as range: <input type="range" name="range" ng-model="value"
-                          min="{{min}}"  max="{{max}}">
-          <hr>
-          Model as number: <input type="number" ng-model="value"><br>
-          Min: <input type="number" ng-model="min"><br>
-          Max: <input type="number" ng-model="min"><br>
-           value = <code>{{value}}</code><br/>
-           myForm.range.$valid = <code>{{myForm.range.$valid}}</code><br/>
-           myForm.range.$error = <code>{{myForm.range.$error}}</code>
+          <script>
+            angular.module('rangeExample', [])
+              .controller('ExampleController', ['$scope', function($scope) {
+                $scope.value = 75;
+                $scope.min = 10;
+                $scope.max = 90;
+              }]);
+          </script>
+          <form name="myForm" ng-controller="ExampleController">
+
+            Model as range: <input type="range" name="range" ng-model="value" min="{{min}}"  max="{{max}}">
+            <hr>
+            Model as number: <input type="number" ng-model="value"><br>
+            Min: <input type="number" ng-model="min"><br>
+            Max: <input type="number" ng-model="min"><br>
+            value = <code>{{value}}</code><br/>
+            myForm.range.$valid = <code>{{myForm.range.$valid}}</code><br/>
+            myForm.range.$error = <code>{{myForm.range.$error}}</code>
           </form>
         </file>
       </example>
@@ -1113,24 +1112,23 @@ var inputType = {
    * @example
       <example name="range-input-directive-ng" module="rangeExample">
         <file name="index.html">
-         <script>
-           angular.module('rangeExample', [])
-             .controller('ExampleController', ['$scope', function($scope) {
-               $scope.value = 75;
-               $scope.min = 10;
-               $scope.max = 90;
-             }]);
-         </script>
-         <form name="myForm" ng-controller="ExampleController">
-           Model as range: <input type="range" name="range" ng-model="value"
-                          ng-min="10" ng-max="90">
-          <hr>
-          Model as number: <input type="number" ng-model="value"><br>
-           Min: <input type="number" ng-model="min"><br>
-           Max: <input type="number" ng-model="min"><br>
-           value = <code>{{value}}</code><br/>
-           myForm.range.$valid = <code>{{myForm.range.$valid}}</code><br/>
-           myForm.range.$error = <code>{{myForm.range.$error}}</code>
+          <script>
+            angular.module('rangeExample', [])
+              .controller('ExampleController', ['$scope', function($scope) {
+                $scope.value = 75;
+                $scope.min = 10;
+                $scope.max = 90;
+              }]);
+          </script>
+          <form name="myForm" ng-controller="ExampleController">
+            Model as range: <input type="range" name="range" ng-model="value" ng-min="min" ng-max="max">
+            <hr>
+            Model as number: <input type="number" ng-model="value"><br>
+            Min: <input type="number" ng-model="min"><br>
+            Max: <input type="number" ng-model="min"><br>
+            value = <code>{{value}}</code><br/>
+            myForm.range.$valid = <code>{{myForm.range.$valid}}</code><br/>
+            myForm.range.$error = <code>{{myForm.range.$error}}</code>
           </form>
         </file>
       </example>
@@ -1594,15 +1592,16 @@ function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) {
       // IE11 doesn't set the el val correctly if the minVal is greater than the element value
       if (minVal > elVal) {
         element.val(minVal);
+        elVal = minVal;
       }
-      ctrl.$setViewValue(element.val());
+      ctrl.$setViewValue(elVal);
     } else {
       // TODO(matsko): implement validateLater to reduce number of validations
       ctrl.$validate();
     }
   }
 
-  var minAttrType = isDefined(attr.min) ? 'min' : attr.ngMin ? 'ngMin' : false;
+  var minAttrType = isDefined(attr.ngMin) ? 'ngMin' : isDefined(attr.min) ? 'min' : false;
   if (minAttrType) {
     ctrl.$validators.min = isDefined(attr.min) && supportsRange ?
       function noopMinValidator(value) {
@@ -1634,8 +1633,9 @@ function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) {
       // IE11 doesn't set the el val correctly if the maxVal is less than the element value
       if (maxVal < elVal) {
         element.val(maxVal);
+        elVal = minVal;
       }
-      ctrl.$setViewValue(element.val());
+      ctrl.$setViewValue(elVal);
     } else {
       // TODO(matsko): implement validateLater to reduce number of validations
       ctrl.$validate();

test/ng/directive/inputSpec.js

@@ -2829,23 +2829,19 @@ describe('input', function() {
       scope = $rootScope;
     });
 
-    it('should parse the input value to a Number', function() {
-      var inputElm = helper.compileInput('<input type="range" ng-model="age" />');
-
-      helper.changeInputValueTo('75');
-      expect(scope.age).toBe(75);
-    });
-
     if (supportsRange) {
       // This behavior only applies to browsers that implement the range input, which do not
       // allow to set a non-number value and will set the value of the input to 50 even when you
       // change it directly on the element.
       // Other browsers fall back to text inputs, where setting a model value of 50 does not make
-      // sense if the input value is a string. These browser will mark the input as invalid instead.
+      // sense if the input value is a string. These browsers will mark the input as invalid instead.
 
       it('should render as 50 if null', function() {
         var inputElm = helper.compileInput('<input type="range" ng-model="age" />');
 
+        helper.changeInputValueTo('25');
+        expect(scope.age).toBe(25);
+
         scope.$apply('age = null');
 
         expect(inputElm.val()).toEqual('50');
@@ -2887,6 +2883,14 @@ describe('input', function() {
       });
     }
 
+    it('should parse the input value to a Number', function() {
+      var inputElm = helper.compileInput('<input type="range" ng-model="age" />');
+
+      helper.changeInputValueTo('75');
+      expect(scope.age).toBe(75);
+    });
+
+
     it('should only invalidate the model if suffering from bad input when the data is parsed', function() {
       scope.age = 60;
 
@@ -2904,21 +2908,11 @@ describe('input', function() {
     });
 
 
-    it('should validate with undefined viewValue when $validate() called', function() {
-      var inputElm = helper.compileInput('<input type="range" name="alias" ng-model="value" />');
-
-      scope.form.alias.$validate();
-
-      expect(inputElm).toBeValid();
-      expect(scope.form.alias.$error.number).toBeUndefined();
-    });
-
-
     it('should throw if the model value is not a number', function() {
       expect(function() {
         scope.value = 'one';
         var inputElm = helper.compileInput('<input type="range" ng-model="value" />');
-      }).toThrowMinErr('ngModel', 'numfmt', "Expected `one` to be a number");
+      }).toThrowMinErr('ngModel', 'numfmt', 'Expected `one` to be a number');
     });