feat(cmbLabel): Add a mergeRangeLabelsIfSame option

In 3afcce9 commit, I changed the behavior of the combined label for range slider. However, this
broke previous implementation, so this commit add an option to configure this feature. The default
behavior is back as previously: If the slider values are the same, the combined label is 'X - X'

Related to #245

Author: Valentin Hervieu

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.0.2 (2016-06-07)
+## Improvement
+- Add a `mergeRangeLabelsIfSame` option (#245).
+
 # 4.0.1 (2016-06-04)
 ## Improvement
 - Add a pointerType arg for the callbacks (onStart, onChange and onEnd) to identify which handle is used (#339).

README.md

@@ -220,7 +220,9 @@ The default options are:
     onStart: null,
     onChange: null,
     onEnd: null,
-    rightToLeft: false
+    rightToLeft: false,
+    boundPointerLabels: true,
+    mergeRangeLabelsIfSame: false
 }
 ````
 
@@ -328,6 +330,10 @@ Just pass an array with each slider value and that's it; the floor, ceil and ste
 
 **onlyBindHandles** - _Boolean (defaults to false)_: Set to true to only bind events on slider handles.
 
+**boundPointerLabels** - _Boolean (defaults to true)_: Set to true to keep the slider labels inside the slider bounds.
+
+**mergeRangeLabelsIfSame** - _Boolean (defaults to false)_: Set to true to merge the range labels if they are the same. For instance, if min and max are 50, the label will be "50 - 50" if `mergeRangeLabelsIfSame: false`, else "50".
+
 **onStart** - _Function(sliderId, modelValue, highValue, pointerType)_: Function to be called when a slider update is started. If an id was set in the options, then it's passed to this callback. This callback is called before any update on the model. `pointerType` is either 'min' or 'max' depending on which handle is used.
 
 **onChange** - _Function(sliderId, modelValue, highValue, pointerType)_: Function to be called when rz-slider-model or rz-slider-high change. If an id was set in the options, then it's passed to this callback. `pointerType` is either 'min' or 'max' depending on which handle is used.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angularjs-slider",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "homepage": "https://github.com/angular-slider/angularjs-slider",
   "authors": [
     "Rafal Zajac <rzajac@gmail.com>",

dist/rzslider.css

@@ -1,7 +1,7 @@
-/*! angularjs-slider - v4.0.1 - 
+/*! angularjs-slider - v4.0.2 - 
  (c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> - 
  https://github.com/angular-slider/angularjs-slider - 
- 2016-06-04 */
+ 2016-06-07 */
 .rzslider {
   position: relative;
   display: inline-block;

dist/rzslider.js

@@ -1,7 +1,7 @@
-/*! angularjs-slider - v4.0.1 - 
+/*! angularjs-slider - v4.0.2 - 
  (c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> - 
  https://github.com/angular-slider/angularjs-slider - 
- 2016-06-04 */
+ 2016-06-07 */
 /*jslint unparam: true */
 /*global angular: false, console: false, define, module */
 (function(root, factory) {
@@ -66,7 +66,8 @@
       onChange: null,
       onEnd: null,
       rightToLeft: false,
-      boundPointerLabels: true
+      boundPointerLabels: true,
+      mergeRangeLabelsIfSame: false
     };
     var globalOptions = {};
 
@@ -1192,7 +1193,7 @@
           var lowTr = this.getDisplayValue(this.lowValue, 'model'),
             highTr = this.getDisplayValue(this.highValue, 'high'),
             labelVal = '';
-          if (lowTr === highTr) {
+          if (this.options.mergeRangeLabelsIfSame && lowTr === highTr) {
             labelVal = lowTr;
           } else {
             labelVal = this.options.rightToLeft ? highTr + ' - ' + lowTr : lowTr + ' - ' + highTr;

dist/rzslider.min.css

@@ -1,6 +1,6 @@
 {
   "name": "angularjs-slider",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "AngularJS slider directive with no external dependencies. Mobile friendly!.",
   "main": "dist/rzslider.js",
   "repository": {

dist/rzslider.min.js

@@ -70,7 +70,8 @@
       onChange: null,
       onEnd: null,
       rightToLeft: false,
-      boundPointerLabels: true
+      boundPointerLabels: true,
+      mergeRangeLabelsIfSame: false
     };
     var globalOptions = {};
 
@@ -1196,7 +1197,7 @@
           var lowTr = this.getDisplayValue(this.lowValue, 'model'),
             highTr = this.getDisplayValue(this.highValue, 'high'),
             labelVal = '';
-          if (lowTr === highTr) {
+          if (this.options.mergeRangeLabelsIfSame && lowTr === highTr) {
             labelVal = lowTr;
           } else {
             labelVal = this.options.rightToLeft ? highTr + ' - ' + lowTr : lowTr + ' - ' + highTr;

package.json

@@ -667,6 +667,22 @@
         expect(helper.slider.lowValue).to.equal(1);
         expect(helper.slider.highValue).to.equal(3);
       });
+
+      it('should set the correct combined label when range values are the same and mergeRangeLabelsIfSame option is false', function() {
+        helper.scope.slider.options.mergeRangeLabelsIfSame = false;
+        helper.scope.slider.min = 50;
+        helper.scope.slider.max = 50;
+        helper.scope.$digest();
+        expect(helper.slider.cmbLab.text()).to.equal('50 - 50');
+      });
+
+      it('should set the correct combined label when range values are the same and mergeRangeLabelsIfSame option is true', function() {
+        helper.scope.slider.options.mergeRangeLabelsIfSame = true;
+        helper.scope.slider.min = 50;
+        helper.scope.slider.max = 50;
+        helper.scope.$digest();
+        expect(helper.slider.cmbLab.text()).to.equal('50');
+      });
     });
 
     describe('options expression specific - ', function() {
@@ -889,8 +905,9 @@
           }
         };
         helper.createSlider(sliderConf);
-        var expectedDimension = Math.floor(helper.slider.valueToOffset(8) + helper.slider.handleHalfDim);
-        expect(helper.slider.selBar[0].getBoundingClientRect().width).to.equal(expectedDimension);
+        var expectedDimension = Math.floor(helper.slider.valueToOffset(8) + helper.slider.handleHalfDim),
+          actualDimension = Math.floor(helper.slider.selBar[0].getBoundingClientRect().width);
+        expect(actualDimension).to.equal(expectedDimension);
         expect(helper.slider.selBar.css('left')).to.equal(helper.slider.valueToOffset(2) + helper.slider.handleHalfDim + 'px');
       });
 
@@ -939,8 +956,9 @@
         };
         helper.createSlider(sliderConf);
         var expectedDimension = Math.floor(helper.slider.valueToOffset(13)),
+          actualDimension = Math.floor(helper.slider.selBar[0].getBoundingClientRect().width),
           expectedPosition = helper.slider.valueToOffset(10) + helper.slider.handleHalfDim;
-        expect(helper.slider.selBar[0].getBoundingClientRect().width).to.equal(expectedDimension);
+        expect(actualDimension).to.equal(expectedDimension);
         expect(helper.slider.selBar.css('left')).to.equal(expectedPosition + 'px');
       });