fix(applyPushRange): Apply the pushRange with maxRange (#456)

Apply the pushRange when the difference is greater than the maxRange set

Close issue #453

Author: GuilloOme

dist/rzslider.css

@@ -1,7 +1,7 @@
 /*! angularjs-slider - v5.8.5 - 
  (c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> - 
  https://github.com/angular-slider/angularjs-slider - 
- 2016-11-05 */
+ 2016-11-08 */
 .rzslider {
   position: relative;
   display: inline-block;

dist/rzslider.js

@@ -1,7 +1,7 @@
 /*! angularjs-slider - v5.8.5 - 
  (c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> - 
  https://github.com/angular-slider/angularjs-slider - 
- 2016-11-05 */
+ 2016-11-08 */
 /*jslint unparam: true */
 /*global angular: false, console: false, define, module */
 (function(root, factory) {
@@ -2141,17 +2141,33 @@
 
       applyPushRange: function(newValue) {
         var difference = this.tracking === 'lowValue' ? this.highValue - newValue : newValue - this.lowValue,
-          range = this.options.minRange !== null ? this.options.minRange : this.options.step;
-        if (difference < range) {
+          minRange = this.options.minRange !== null ? this.options.minRange : this.options.step,
+          maxRange = this.options.maxRange;
+        // if smaller than minRange
+        if (difference < minRange) {
           if (this.tracking === 'lowValue') {
-            this.highValue = Math.min(newValue + range, this.maxValue);
-            newValue = this.highValue - range;
+            this.highValue = Math.min(newValue + minRange, this.maxValue);
+            newValue = this.highValue - minRange;
             this.applyHighValue();
             this.updateHandles('highValue', this.valueToPosition(this.highValue));
           }
           else {
-            this.lowValue = Math.max(newValue - range, this.minValue);
-            newValue = this.lowValue + range;
+            this.lowValue = Math.max(newValue - minRange, this.minValue);
+            newValue = this.lowValue + minRange;
+            this.applyLowValue();
+            this.updateHandles('lowValue', this.valueToPosition(this.lowValue));
+          }
+          this.updateAriaAttributes();
+        }
+        // if greater than maxRange
+        else if (maxRange !== null && difference > maxRange) {
+          if (this.tracking === 'lowValue') {
+            this.highValue = newValue + maxRange;
+            this.applyHighValue();
+            this.updateHandles('highValue', this.valueToPosition(this.highValue));
+          }
+          else {
+            this.lowValue = newValue - maxRange;
             this.applyLowValue();
             this.updateHandles('lowValue', this.valueToPosition(this.lowValue));
           }

dist/rzslider.min.css

@@ -1,7 +1,7 @@
 /*! angularjs-slider - v5.8.5 - 
  (c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> - 
  https://github.com/angular-slider/angularjs-slider - 
- 2016-11-05 */
+ 2016-11-08 */
 .rzslider {
   position: relative;
   display: inline-block;

dist/rzslider.min.js

@@ -2145,17 +2145,33 @@
 
       applyPushRange: function(newValue) {
         var difference = this.tracking === 'lowValue' ? this.highValue - newValue : newValue - this.lowValue,
-          range = this.options.minRange !== null ? this.options.minRange : this.options.step;
-        if (difference < range) {
+          minRange = this.options.minRange !== null ? this.options.minRange : this.options.step,
+          maxRange = this.options.maxRange;
+        // if smaller than minRange
+        if (difference < minRange) {
           if (this.tracking === 'lowValue') {
-            this.highValue = Math.min(newValue + range, this.maxValue);
-            newValue = this.highValue - range;
+            this.highValue = Math.min(newValue + minRange, this.maxValue);
+            newValue = this.highValue - minRange;
             this.applyHighValue();
             this.updateHandles('highValue', this.valueToPosition(this.highValue));
           }
           else {
-            this.lowValue = Math.max(newValue - range, this.minValue);
-            newValue = this.lowValue + range;
+            this.lowValue = Math.max(newValue - minRange, this.minValue);
+            newValue = this.lowValue + minRange;
+            this.applyLowValue();
+            this.updateHandles('lowValue', this.valueToPosition(this.lowValue));
+          }
+          this.updateAriaAttributes();
+        }
+        // if greater than maxRange
+        else if (maxRange !== null && difference > maxRange) {
+          if (this.tracking === 'lowValue') {
+            this.highValue = newValue + maxRange;
+            this.applyHighValue();
+            this.updateHandles('highValue', this.valueToPosition(this.highValue));
+          }
+          else {
+            this.lowValue = newValue - maxRange;
             this.applyLowValue();
             this.updateHandles('lowValue', this.valueToPosition(this.lowValue));
           }

dist/rzslider.scss

@@ -128,6 +128,26 @@
       expect(helper.scope.slider.min).to.equal(40);
       expect(helper.scope.slider.max).to.equal(40);
     });
+
+    it('should pull minH when moving maxH above maxRange', function () {
+      helper.scope.slider.options.maxRange = 15;
+      helper.scope.$digest();
+
+      helper.fireMousedown(helper.slider.maxH, 0);
+      helper.moveMouseToValue(80);
+      expect(helper.scope.slider.min).to.equal(65);
+      expect(helper.scope.slider.max).to.equal(80);
+    });
+
+    it('should pull maxH when moving minH above maxRange', function () {
+      helper.scope.slider.options.maxRange = 15;
+      helper.scope.$digest();
+
+      helper.fireMousedown(helper.slider.minH, 0);
+      helper.moveMouseToValue(20);
+      expect(helper.scope.slider.min).to.equal(20);
+      expect(helper.scope.slider.max).to.equal(35);
+    });
   });
 
 }());