Skip to content

add the option to use ticksArray as array of objects, with legend and value properties #662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 23, 2019
Merged

add the option to use ticksArray as array of objects, with legend and value properties #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8850a54
add the option to use ticksArray as array of objects, same as stepsAr…
vdiez Feb 20, 2019
e6f070f
feat($browser): Accept TicksArray to be an array of object as stepsAr…
vdiez Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dist/rzslider.css
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions dist/rzslider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! angularjs-slider - v6.6.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 -
2018-06-30 */
2019-02-21 */
/*jslint unparam: true */
/*global angular: false, console: false, define, module */
;(function(root, factory) {
Expand Down Expand Up @@ -1033,12 +1033,19 @@
if (this.options.rightToLeft) ticksArray.reverse()

this.scope.ticks = ticksArray.map(function(value) {
var legend = null;
if (angular.isObject(value)) {
legend = value.legend;
value = value.value
}

var position = self.valueToPosition(value)

if (self.options.vertical) position = self.maxPos - position

var translation = translate + '(' + Math.round(position) + 'px)'
var tick = {
legend: legend,
selected: self.isTickSelected(value),
style: {
'-webkit-transform': translation,
Expand Down Expand Up @@ -1071,7 +1078,7 @@
}
}
if (self.getLegend) {
var legend = self.getLegend(value, self.options.id)
legend = self.getLegend(value, self.options.id)
if (legend) tick.legend = legend
}
return tick
Expand Down
2 changes: 1 addition & 1 deletion dist/rzslider.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions dist/rzslider.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/rzslider.scss
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion src/rzslider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,12 +1037,19 @@
if (this.options.rightToLeft) ticksArray.reverse()

this.scope.ticks = ticksArray.map(function(value) {
var legend = null;
if (angular.isObject(value)) {
legend = value.legend;
value = value.value
}

var position = self.valueToPosition(value)

if (self.options.vertical) position = self.maxPos - position

var translation = translate + '(' + Math.round(position) + 'px)'
var tick = {
legend: legend,
selected: self.isTickSelected(value),
style: {
'-webkit-transform': translation,
Expand Down Expand Up @@ -1075,7 +1082,7 @@
}
}
if (self.getLegend) {
var legend = self.getLegend(value, self.options.id)
legend = self.getLegend(value, self.options.id)
if (legend) tick.legend = legend
}
return tick
Expand Down
33 changes: 33 additions & 0 deletions tests/specs/ticks-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,39 @@
expect(lastTick.text()).to.equal('100')
})

it('should create the correct number of ticks when ticksArray is used as array of objects', function() {
var sliderConf = {
value: 50,
options: {
floor: 0,
ceil: 100,
step: 10,
ticksArray: [
{ value: 0, legend: 'Bad' },
{ value: 50, legend: 'Average' },
{ value: 100, legend: 'Excellent' },
],
},
}
helper.createSlider(sliderConf)
expect(helper.element[0].querySelectorAll('.rz-tick')).to.have.length(3)
expect(
helper.element[0].querySelectorAll('.rz-tick-value')
).to.have.length(0)

expect(
helper.element[0].querySelectorAll('.rz-tick-legend')
).to.have.length(3)
var firstLegend = angular.element(
helper.element[0].querySelectorAll('.rz-tick-legend')[0]
)
expect(firstLegend.text()).to.equal('Bad')
var lastLegend = angular.element(
helper.element[0].querySelectorAll('.rz-tick-legend')[2]
)
expect(lastLegend.text()).to.equal('Excellent')
})

it('should create the correct number of legend items when getLegend is defined', function() {
var sliderConf = {
value: 50,
Expand Down