Add the step value on the ticks

Author: Valentin Hervieu

Gruntfile.js

@@ -100,7 +100,7 @@ module.exports = function(grunt) {
         },
         watch: {
             all: {
-                files: ['dist/*'],
+                files: ['dist/*', 'demo/*'],
                 options: {
                     livereload: true
                 }

README.md

@@ -131,6 +131,10 @@ $scope.priceSlider = {
 
 > Display a tick for each value.
 
+**rz-slider-show-ticks-value**
+
+> Display a tick for each value and the value of the tick.
+
 ```javascript
 // In your controller
 

demo/index.html

@@ -94,6 +94,15 @@ <h2>Slider with ticks example</h2>
                   rz-slider-show-ticks="true"></rzslider>
     </article>
 
+    <article>
+        <h2>Slider with ticks value example</h2>
+        Value: {{ priceSlider5 | json }}
+        <rzslider rz-slider-model="priceSlider5"
+                  rz-slider-floor="0"
+                  rz-slider-ceil="10"
+                  rz-slider-show-ticks-value="true"></rzslider>
+    </article>
+
     <article>
         <h2>Draggable range example</h2>
         Value:
@@ -141,6 +150,7 @@ <h2>Toggle slider example</h2>
     $scope.priceSlider2 = 150;
     $scope.priceSlider3 = 250;
     $scope.priceSlider4 = 5;
+    $scope.priceSlider5 = 5;
 
     $scope.translate = function(value) {
       return '$' + value;

dist/rzslider.css

@@ -112,18 +112,28 @@ rzslider span.rz-bubble.rz-limit {
 rzslider .rz-ticks {
   position: absolute;
   top: -3px;
+  left: 0;
   z-index: 1;
   display: flex;
-  padding: 0;
+  width: 100%;
+  padding: 0 11px;
   margin: 0;
   list-style: none;
+  box-sizing: border-box;
   justify-content: space-between;
 }
 
-rzslider .rz-ticks li {
+rzslider .rz-ticks .tick {
   width: 10px;
   height: 10px;
+  text-align: center;
   cursor: pointer;
   background: #666666;
   border-radius: 50%;
+}
+
+rzslider .rz-ticks .tick .tick-value {
+  position: absolute;
+  top: -30px;
+  transform: translate(-50%, 0);
 }

dist/rzslider.js

@@ -216,7 +216,14 @@ function throttle(func, wait, options) {
      *
      * @type {boolean}
      */
-    this.showTicks = attributes.rzSliderShowTicks === 'true';
+    this.showTicks = attributes.rzSliderShowTicks || attributes.rzSliderShowTicksValue;
+
+    /**
+     * Display the value on each tick.
+     *
+     * @type {boolean}
+     */
+    this.showTicksValue = attributes.rzSliderShowTicksValue;
 
     /**
      * The delta between min and max value
@@ -363,6 +370,20 @@ function throttle(func, wait, options) {
       });
       this.deRegFuncs.push(unRegFn);
 
+      unRegFn = this.scope.$watch('rzSliderShowTicks', function(newValue, oldValue)
+      {
+        if(newValue === oldValue) { return; }
+        self.resetSlider();
+      });
+      this.deRegFuncs.push(unRegFn);
+
+      unRegFn = this.scope.$watch('rzSliderShowTicksValue', function(newValue, oldValue)
+      {
+        if(newValue === oldValue) { return; }
+        self.resetSlider();
+      });
+      this.deRegFuncs.push(unRegFn);
+
       this.scope.$on('$destroy', function()
       {
         self.minH.off();
@@ -518,7 +539,6 @@ function throttle(func, wait, options) {
       this.minLab.rzsl = 0;
       this.maxLab.rzsl = 0;
       this.cmbLab.rzsl = 0;
-      this.ticks.rzsl = 0;
 
       // Hide limit labels
       if(this.hideLimitLabels)
@@ -529,6 +549,17 @@ function throttle(func, wait, options) {
         this.hideEl(this.ceilLab);
       }
 
+      if(this.showTicksValue) {
+        this.flrLab.rzAlwaysHide = true;
+        this.ceilLab.rzAlwaysHide = true;
+        this.minLab.rzAlwaysHide = true;
+        this.maxLab.rzAlwaysHide = true;
+        this.hideEl(this.flrLab);
+        this.hideEl(this.ceilLab);
+        this.hideEl(this.minLab);
+        this.hideEl(this.maxLab);
+      }
+
       // Remove stuff not needed in single slider
       if(this.range === false)
       {
@@ -590,16 +621,16 @@ function throttle(func, wait, options) {
      * @returns {undefined}
      */
     updateTicksScale: function() {
+        if(!this.step) return; //if step is 0, the following loop will be endless.
+
         var positions = '';
-        for (var i = this.minValue; i < this.maxValue; i += this.step) {
-            positions += '<li></li>';
+        for (var i = this.minValue; i <= this.maxValue; i += this.step) {
+          positions += '<li class="tick">';
+          if(this.showTicksValue)
+            positions += '<span class="tick-value">'+ this.getDisplayValue(i) +'</span>';
+          positions += '</li>';
         }
-        positions += '<li></li>';
         this.ticks.html(positions);
-        this.ticks.css({
-          width: (this.barWidth - 2 * this.handleHalfWidth) + 'px',
-          left: this.handleHalfWidth + 'px'
-        });
     },
 
     /**
@@ -816,16 +847,8 @@ function throttle(func, wait, options) {
 
       if(this.minLab.rzsl + this.minLab.rzsw + 10 >= this.maxLab.rzsl)
       {
-        if(this.customTrFn)
-        {
-          lowTr = this.customTrFn(this.scope.rzSliderModel);
-          highTr = this.customTrFn(this.scope.rzSliderHigh);
-        }
-        else
-        {
-          lowTr = this.scope.rzSliderModel;
-          highTr = this.scope.rzSliderHigh;
-        }
+        lowTr = this.getDisplayValue(this.scope.rzSliderModel);
+        highTr = this.getDisplayValue(this.scope.rzSliderHigh);
 
         this.translateFn(lowTr + ' - ' + highTr, this.cmbLab, false);
         this.setLeft(this.cmbLab, this.selBar.rzsl + this.selBar.rzsw / 2 - this.cmbLab.rzsw / 2);
@@ -841,6 +864,15 @@ function throttle(func, wait, options) {
       }
     },
 
+    /**
+     * Return the translated value if a translate function is provided else the original value
+     * @param value
+     * @returns {*}
+     */
+    getDisplayValue: function(value) {
+      return  this.customTrFn ? this.customTrFn(value): value;
+    },
+
     /**
      * Round value to step and precision
      *
@@ -1304,7 +1336,8 @@ function throttle(func, wait, options) {
       rzSliderOnStart: '&',
       rzSliderOnChange: '&',
       rzSliderOnEnd: '&',
-      rzSliderShowTicks: '@'
+      rzSliderShowTicks: '=?',
+      rzSliderShowTicksValue: '=?'
     },
 
     /**