feat(range): Add a minRange option

The minimum range authorized on the slider.

Closes #231

Author: Valentin Hervieu

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.5.0 (not-released)
+## Features
+- Add a `minRange` option to set a minimal range (#231).
+
 # 2.4.1 (2016-01-15)
 ## Performance improvements
 - Remove the $timeout call in the init method (#223).

README.md

@@ -157,6 +157,7 @@ The default options are:
     ceil: null, //defaults to rz-slider-model
     step: 1,
     precision: 0,
+    minRange: 0,
     id: null,
     translate: null,
     stepsArray: null,
@@ -192,6 +193,8 @@ The default options are:
 
 **precision** - _Number (defaults to 0)_: The precision to display values with. The `toFixed()` is used internally for this.
 
+**minRange** - _Number (defaults to 0)_: The minimum range authorized on the slider.
+
 **translate** - _Function(value, sliderId)_: Custom translate function. Use this if you want to translate values displayed on the slider. For example if you want to display dollar amounts instead of just numbers:
 ```html
 <div>

demo/demo.js

@@ -6,13 +6,37 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
     value: 10
   };
 
+  //Range slider config
+  $scope.rangeSlider = {
+    minValue: 10,
+    maxValue: 90,
+    options: {
+      floor: 0,
+      ceil: 100,
+      step: 1
+    }
+  };
+
+  //Range slider with minRange config
+  $scope.minRangeSlider = {
+    minValue: 10,
+    maxValue: 90,
+    options: {
+      floor: 0,
+      ceil: 100,
+      step: 1,
+      minRange: 10
+    }
+  };
+
   //Slider with selection bar
   $scope.slider_visible_bar = {
     value: 10,
     options: {
       showSelectionBar: true
     }
   };
+
   //Slider with selection bar end
   $scope.slider_visible_bar_end = {
     value: 10,
@@ -22,17 +46,6 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
     }
   };
 
-  //Range slider config
-  $scope.minRangeSlider = {
-    minValue: 10,
-    maxValue: 90,
-    options: {
-      floor: 0,
-      ceil: 100,
-      step: 1
-    }
-  };
-
   //Slider with selection bar
   $scope.color_slider_bar = {
     value: 12,

demo/index.html

@@ -27,8 +27,17 @@ <h2>Simple slider</h2>
 
   <article>
     <h2>Range slider</h2>
-    Min Value: <input type="number" ng-model="minRangeSlider.minValue"/><br/>
-    Max Value: <input type="number" ng-model="minRangeSlider.maxValue"/><br/>
+    Min Value: <input type="number" ng-model="rangeSlider.minValue"/><br/>
+    Max Value: <input type="number" ng-model="rangeSlider.maxValue"/><br/>
+    <rzslider
+      rz-slider-model="rangeSlider.minValue"
+      rz-slider-high="rangeSlider.maxValue"
+      rz-slider-options="rangeSlider.options"
+    ></rzslider>
+  </article>
+
+  <article>
+    <h2>Range slider with minimum range of 10</h2>
     <rzslider
       rz-slider-model="minRangeSlider.minValue"
       rz-slider-high="minRangeSlider.maxValue"

dist/rzslider.css

@@ -1,7 +1,7 @@
 /*! angularjs-slider - v2.4.1 - 
  (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-01-15 */
+ 2016-01-22 */
 rzslider {
   position: relative;
   display: inline-block;

dist/rzslider.js

@@ -1,7 +1,7 @@
 /*! angularjs-slider - v2.4.1 - 
  (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-01-15 */
+ 2016-01-22 */
 /*jslint unparam: true */
 /*global angular: false, console: false, define, module */
 (function(root, factory) {
@@ -31,6 +31,7 @@
       ceil: null, //defaults to rz-slider-model
       step: 1,
       precision: 0,
+      minRange: 0,
       id: null,
       translate: null,
       stepsArray: null,
@@ -736,7 +737,7 @@
         this.scope.ticks = [];
         for (var i = 0; i < ticksCount; i++) {
           var value = this.roundStep(this.minValue + i * this.step);
-          var tick =   {
+          var tick = {
             selected: this.isTickSelected(value)
           };
           if (tick.selected && this.options.getSelectionBarColor) {
@@ -1514,7 +1515,9 @@
         var switched = false;
 
         if (this.range) {
-          /* This is to check if we need to switch the min and max handles*/
+          newValue = this.applyMinRange(newValue);
+          newOffset = this.valueToOffset(newValue);
+          /* This is to check if we need to switch the min and max handles */
           if (this.tracking === 'rzSliderModel' && newValue >= this.scope.rzSliderHigh) {
             switched = true;
             this.scope[this.tracking] = this.scope.rzSliderHigh;
@@ -1553,6 +1556,21 @@
         return switched;
       },
 
+      applyMinRange: function(newValue) {
+        if (this.options.minRange !== 0) {
+          var oppositeValue = this.tracking === 'rzSliderModel' ? this.scope.rzSliderHigh : this.scope.rzSliderModel,
+            difference = Math.abs(newValue - oppositeValue);
+
+          if (difference < this.options.minRange) {
+            if (this.tracking === 'rzSliderModel')
+              return this.scope.rzSliderHigh - this.options.minRange;
+            else
+              return this.scope.rzSliderModel + this.options.minRange;
+          }
+        }
+        return newValue;
+      },
+
       /**
        * Apply the model values using scope.$apply.
        * We wrap it with the internalChange flag to avoid the watchers to be called

dist/rzslider.min.css

@@ -35,6 +35,7 @@
       ceil: null, //defaults to rz-slider-model
       step: 1,
       precision: 0,
+      minRange: 0,
       id: null,
       translate: null,
       stepsArray: null,
@@ -740,7 +741,7 @@
         this.scope.ticks = [];
         for (var i = 0; i < ticksCount; i++) {
           var value = this.roundStep(this.minValue + i * this.step);
-          var tick =   {
+          var tick = {
             selected: this.isTickSelected(value)
           };
           if (tick.selected && this.options.getSelectionBarColor) {
@@ -1518,7 +1519,9 @@
         var switched = false;
 
         if (this.range) {
-          /* This is to check if we need to switch the min and max handles*/
+          newValue = this.applyMinRange(newValue);
+          newOffset = this.valueToOffset(newValue);
+          /* This is to check if we need to switch the min and max handles */
           if (this.tracking === 'rzSliderModel' && newValue >= this.scope.rzSliderHigh) {
             switched = true;
             this.scope[this.tracking] = this.scope.rzSliderHigh;
@@ -1557,6 +1560,21 @@
         return switched;
       },
 
+      applyMinRange: function(newValue) {
+        if (this.options.minRange !== 0) {
+          var oppositeValue = this.tracking === 'rzSliderModel' ? this.scope.rzSliderHigh : this.scope.rzSliderModel,
+            difference = Math.abs(newValue - oppositeValue);
+
+          if (difference < this.options.minRange) {
+            if (this.tracking === 'rzSliderModel')
+              return this.scope.rzSliderHigh - this.options.minRange;
+            else
+              return this.scope.rzSliderModel + this.options.minRange;
+          }
+        }
+        return newValue;
+      },
+
       /**
        * Apply the model values using scope.$apply.
        * We wrap it with the internalChange flag to avoid the watchers to be called