fix(highLab): Fix high label positioning when size is different than the ceil one.

Valentin Hervieu · Valentin Hervieu · commit c69847741bd2 · 2016-02-06T20:00:18.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.7.1 (2016-02-06)
+## Fix
+- Fix high label positioning when size is different than the ceil one.
+
 # 2.7.0 (2016-02-06)
 ## Features
 - Add an `enforceStep` option (defaults to true) (#246).
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angularjs-slider",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "homepage": "https://github.com/angular-slider/angularjs-slider",
   "authors": [
     "Rafal Zajac <rzajac@gmail.com>",
diff --git a/demo/demo.js b/demo/demo.js
@@ -135,6 +135,26 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
     }
   };
 
+  //Slider config with custom display function using html formatting
+  $scope.slider_translate_html = {
+    minValue: 100,
+    maxValue: 400,
+    options: {
+      floor: 0,
+      ceil: 500,
+      translate: function(value, sliderId, label) {
+        switch (label) {
+          case 'model':
+            return '<b>Min price:</b> $' + value;
+          case 'high':
+            return '<b>Max price:</b> $' + value;
+          default:
+            return '$' + value
+        }
+      }
+    }
+  };
+
   //Slider config with steps array of letters
   $scope.slider_alphabet = {
     value: 0,
diff --git a/demo/index.html b/demo/index.html
@@ -115,6 +115,15 @@ <h2>Slider with custom display function</h2>
     ></rzslider>
   </article>
 
+  <article>
+    <h2>Slider with custom display function using html formatting</h2>
+    <rzslider
+      rz-slider-model="slider_translate_html.minValue"
+      rz-slider-high="slider_translate_html.maxValue"
+      rz-slider-options="slider_translate_html.options"
+    ></rzslider>
+  </article>
+
   <article>
     <h2>Slider with Alphabet</h2>
     <rzslider
diff --git a/dist/rzslider.css b/dist/rzslider.css
@@ -1,4 +1,4 @@
-/*! angularjs-slider - v2.7.0 - 
+/*! angularjs-slider - v2.7.1 - 
  (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-02-06 */
diff --git a/dist/rzslider.js b/dist/rzslider.js
@@ -1,4 +1,4 @@
-/*! angularjs-slider - v2.7.0 - 
+/*! angularjs-slider - v2.7.1 - 
  (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-02-06 */
@@ -885,7 +885,7 @@
             newOffset - this.minLab.rzsd / 2 + this.handleHalfDim,
             0
           ),
-          this.barDimension - this.ceilLab.rzsd
+          this.barDimension - this.minLab.rzsd
         );
         this.setPosition(this.minLab, pos);
 
@@ -901,7 +901,7 @@
       updateHighHandle: function(newOffset) {
         this.setPosition(this.maxH, newOffset);
         this.translateFn(this.scope.rzSliderHigh, this.maxLab, 'high');
-        var pos = Math.min(newOffset - this.maxLab.rzsd / 2 + this.handleHalfDim, this.barDimension - this.ceilLab.rzsd);
+        var pos = Math.min(newOffset - this.maxLab.rzsd / 2 + this.handleHalfDim, this.barDimension - this.maxLab.rzsd);
         this.setPosition(this.maxLab, pos);
 
         this.shFloorCeil();
diff --git a/dist/rzslider.min.css b/dist/rzslider.min.css
diff --git a/dist/rzslider.min.js b/dist/rzslider.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angularjs-slider",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "AngularJS slider directive with no external dependencies. Mobile friendly!.",
   "main": "dist/rzslider.js",
   "repository": {
diff --git a/src/rzslider.js b/src/rzslider.js
@@ -889,7 +889,7 @@
             newOffset - this.minLab.rzsd / 2 + this.handleHalfDim,
             0
           ),
-          this.barDimension - this.ceilLab.rzsd
+          this.barDimension - this.minLab.rzsd
         );
         this.setPosition(this.minLab, pos);
 
@@ -905,7 +905,7 @@
       updateHighHandle: function(newOffset) {
         this.setPosition(this.maxH, newOffset);
         this.translateFn(this.scope.rzSliderHigh, this.maxLab, 'high');
-        var pos = Math.min(newOffset - this.maxLab.rzsd / 2 + this.handleHalfDim, this.barDimension - this.ceilLab.rzsd);
+        var pos = Math.min(newOffset - this.maxLab.rzsd / 2 + this.handleHalfDim, this.barDimension - this.maxLab.rzsd);
         this.setPosition(this.maxLab, pos);
 
         this.shFloorCeil();

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angularjs-slider",`
`3`		`- "version": "2.7.0",`
	`3`	`+ "version": "2.7.1",`
`4`	`4`	`"homepage": "https://github.com/angular-slider/angularjs-slider",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Rafal Zajac <[email protected]>",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/*! angularjs-slider - v2.7.0 -`
	`1`	`+/*! angularjs-slider - v2.7.1 -`
`2`	`2`	`(c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> -`
`3`	`3`	`https://github.com/angular-slider/angularjs-slider -`
`4`	`4`	`2016-02-06 */`