Skip to content

Commit feb36f0

Browse files
committed
Handle different values for showTicks and showTicksValues
Close #550.
1 parent 0363624 commit feb36f0

File tree

11 files changed

+46
-15
lines changed

11 files changed

+46
-15
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 6.3.0 (2017-08-07)
2+
## Feature
3+
- Handle different values for `showTicks` and `showTicksValues` (#550).
4+
15
# 6.2.3 (2017-07-08)
26
## Tooling
37
- Add Typescript definition file.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angularjs-slider",
3-
"version": "6.2.3",
3+
"version": "6.3.0",
44
"homepage": "https://github.com/angular-slider/angularjs-slider",
55
"authors": [
66
"Rafal Zajac <[email protected]>",

demo/demo.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $uibModal) {
88
$scope.debugSlider = {
99
value: 50,
1010
options: {
11+
showTicks: 5,
12+
showTicksValues: 10,
1113
floor: 0,
1214
ceil: 100,
15+
step: 5,
1316
showSelectionBar: true
1417
}
1518
};

dist/rzslider.css

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rzslider.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/*! angularjs-slider - v6.2.3 -
1+
/*! angularjs-slider - v6.3.0 -
22
(c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> -
33
https://github.com/angular-slider/angularjs-slider -
4-
2017-07-08 */
4+
2017-08-07 */
55
/*jslint unparam: true */
66
/*global angular: false, console: false, define, module */
77
(function(root, factory) {
@@ -1008,7 +1008,7 @@
10081008
tick.tooltip = self.options.ticksTooltip(value);
10091009
tick.tooltipPlacement = self.options.vertical ? 'right' : 'top';
10101010
}
1011-
if (self.options.showTicksValues) {
1011+
if (self.options.showTicksValues === true || value % self.options.showTicksValues === 0) {
10121012
tick.value = self.getDisplayValue(value, 'tick-value');
10131013
if (self.options.ticksValuesTooltip) {
10141014
tick.valueTooltip = self.options.ticksValuesTooltip(value);

dist/rzslider.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rzslider.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rzslider.scss

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angularjs-slider",
3-
"version": "6.2.3",
3+
"version": "6.3.0",
44
"description": "AngularJS slider directive with no external dependencies. Mobile friendly!.",
55
"main": "dist/rzslider.js",
66
"types": "dist/rzslider.d.ts",

src/rzslider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@
10121012
tick.tooltip = self.options.ticksTooltip(value);
10131013
tick.tooltipPlacement = self.options.vertical ? 'right' : 'top';
10141014
}
1015-
if (self.options.showTicksValues) {
1015+
if (self.options.showTicksValues === true || value % self.options.showTicksValues === 0) {
10161016
tick.value = self.getDisplayValue(value, 'tick-value');
10171017
if (self.options.ticksValuesTooltip) {
10181018
tick.valueTooltip = self.options.ticksValuesTooltip(value);

0 commit comments

Comments
 (0)