2.12.0 release

ValentinH · ValentinH · commit 2ffe193d59cd · 2016-04-22T08:42:17.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,14 @@
+# 2.12.0 (2016-04-22)
+## Features
+- Accept numbers for showTicks/showTicksValues to display ticks at intermediate positions (#264).
+
 # 2.11.0 (2016-04-01)
 ## Features
 - Add a hidePointerLabels option (#273).
 
 ## Fix
 - Position long labels on vertical sliders correctly (#306).
 
-
 # 2.10.4 (2016-03-16)
 ## Fix
 - Fix the floor limit when floor is different than 0 (#293).
diff --git a/README.md b/README.md
@@ -285,9 +285,9 @@ $scope.slider = {
 
 **interval** - _Number in ms (defaults to 350)_: Internally, a `throttle` function (See http://underscorejs.org/#throttle) is used when the model or high values of the slider are changed from outside the slider. This is to prevent from re-rendering the slider too many times in a row. `interval` is the number of milliseconds to wait between two updates of the slider.
 
-**showTicks** - _Boolean (defaults to false)_: Set to true to display a tick for each step of the slider.
+**showTicks** - _Boolean or Number (defaults to false)_: Set to true to display a tick for each step of the slider. Set an integer to display ticks at intermediate positions.
 
-**showTicksValues** - _Boolean (defaults to false)_: Set to true to display a tick and  the step value for each step of the slider.
+**showTicksValues** - _Boolean or Number (defaults to false)_: Set to true to display a tick and the step value for each step of the slider. Set an integer to display ticks and the step value at intermediate positions.
 
 **ticksTooltip** - _Function(value) (defaults to null)_: (requires angular-ui bootstrap) Used to display a tooltip when a tick is hovered. Set to a function that returns the tooltip content for a given value.
 
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angularjs-slider",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "homepage": "https://github.com/angular-slider/angularjs-slider",
   "authors": [
     "Rafal Zajac <rzajac@gmail.com>",
diff --git a/dist/rzslider.css b/dist/rzslider.css
@@ -1,7 +1,7 @@
-/*! angularjs-slider - v2.11.0 - 
+/*! angularjs-slider - v2.12.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-04-01 */
+ 2016-04-22 */
 rzslider {
   position: relative;
   display: inline-block;
diff --git a/dist/rzslider.js b/dist/rzslider.js
@@ -1,4 +1,4 @@
-/*! angularjs-slider - v2.11.0 - 
+/*! angularjs-slider - v2.12.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-04-22 */
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.11.0",
+  "version": "2.12.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": "2.11.0",`
	`3`	`+ "version": "2.12.0",`
`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.11.0 -`
	`1`	`+/*! angularjs-slider - v2.12.0 -`
`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-04-22 */`