5.4.0 release

Valentin Hervieu · Valentin Hervieu · commit f947823ca42c · 2016-07-13T08:48:57.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 5.4.0 (2016-07-13)
+## Features
+- Add function to customize color of ticks (#372).
+
 # 5.3.0 (2016-07-11)
 ## Features
 - Expose labels on scope in template (#358).
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angularjs-slider",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "homepage": "https://github.com/angular-slider/angularjs-slider",
   "authors": [
     "Rafal Zajac <rzajac@gmail.com>",
diff --git a/demo/demo.js b/demo/demo.js
@@ -127,6 +127,27 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
     }
   };
 
+  //Slider with custom tick formatting
+  $scope.slider_tick_color = {
+    value: 0,
+    options: {
+      ceil: 1200,
+      floor: 0,
+      step: 50,
+      showSelectionBar: true,
+      showTicks: true,
+      getTickColor: function(value){
+        if (value < 300)
+          return 'red';
+        if (value < 600)
+          return 'orange';
+        if (value < 900)
+          return 'yellow';
+        return '#2AE02A';
+      }
+    }
+  };
+
   //Slider config with floor, ceil and step
   $scope.slider_floor_ceil = {
     value: 12,
@@ -333,24 +354,6 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
     }
   };
 
-  //Slider with custom tick formating
-  $scope.slider_custom_tick_format = {
-    value: 30,
-    options: {
-      ceil: 1000,
-      floor: 0,
-      showSelectionBar: true,
-      showTicks: true,
-      getTickColor: function(value){
-        if(value > 100){
-          return 'red'; 
-        }
-        return 'blue';
-      }
-    }
-  };
-
-
   //Vertical sliders
   $scope.verticalSlider1 = {
     value: 0,
diff --git a/demo/index.html b/demo/index.html
@@ -111,6 +111,14 @@ <h2>Slider with dynamic pointer color</h2>
     ></rzslider>
   </article>
 
+  <article>
+    <h2>Slider with dynamic tick color</h2>
+    <rzslider
+      rz-slider-model="slider_tick_color.value"
+      rz-slider-options="slider_tick_color.options"
+    ></rzslider>
+  </article>
+
   <article>
     <h2>Slider with custom floor/ceil/step</h2>
     <rzslider
@@ -252,14 +260,6 @@ <h2>Slider with draggable range only</h2>
     ></rzslider>
   </article>
 
-  <article>
-    <h2>Slider with custom tick formatting</h2>
-    <rzslider
-      rz-slider-model="slider_custom_tick_format.value"
-      rz-slider-options="slider_custom_tick_format.options"
-    ></rzslider>
-  </article>
-
   <article>
     <h2>Vertical sliders</h2>
     <div class="row vertical-sliders" style="margin: 20px;">
diff --git a/dist/rzslider.css b/dist/rzslider.css
@@ -1,7 +1,7 @@
-/*! angularjs-slider - v5.3.0 - 
+/*! angularjs-slider - v5.4.0 - 
  (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-07-12 */
+ 2016-07-13 */
 .rzslider {
   position: relative;
   display: inline-block;
diff --git a/dist/rzslider.js b/dist/rzslider.js
@@ -1,7 +1,7 @@
-/*! angularjs-slider - v5.3.0 - 
+/*! angularjs-slider - v5.4.0 - 
  (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-07-12 */
+ 2016-07-13 */
 /*jslint unparam: true */
 /*global angular: false, console: false, define, module */
 (function(root, factory) {
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": "5.3.0",
+  "version": "5.4.0",
   "description": "AngularJS slider directive with no external dependencies. Mobile friendly!.",
   "main": "dist/rzslider.js",
   "repository": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angularjs-slider",`
`3`		`- "version": "5.3.0",`
	`3`	`+ "version": "5.4.0",`
`4`	`4`	`"homepage": "https://github.com/angular-slider/angularjs-slider",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Rafal Zajac <[email protected]>",`