Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion dist/rzslider.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! angularjs-slider - v5.4.3 -
(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-08-07 */
2016-08-25 */
.rzslider {
position: relative;
display: inline-block;
Expand Down
18 changes: 12 additions & 6 deletions dist/rzslider.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! angularjs-slider - v5.4.3 -
(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-08-07 */
2016-08-25 */
/*jslint unparam: true */
/*global angular: false, console: false, define, module */
(function(root, factory) {
Expand Down Expand Up @@ -71,7 +71,8 @@
rightToLeft: false,
boundPointerLabels: true,
mergeRangeLabelsIfSame: false,
customTemplateScope: null
customTemplateScope: null,
showLimitLabels: false
};
var globalOptions = {};

Expand Down Expand Up @@ -314,7 +315,7 @@
this.maxLab = null; // Label above the high value
this.cmbLab = null; // Combined label
this.ticks = null; // The ticks

// Initialize slider
this.init();
};
Expand Down Expand Up @@ -1069,7 +1070,9 @@
};
}

this.shFloorCeil();
if(!this.options.showLimitLabels){
this.shFloorCeil();
}
},

/**
Expand All @@ -1089,8 +1092,11 @@
backgroundColor: pointercolor
};
}

this.shFloorCeil();
console.log(this.options.showLimitLabels)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be removed.

if(!this.optionsshowLimitLabels){
this.shFloorCeil();
}

},

/**
Expand Down
2 changes: 1 addition & 1 deletion dist/rzslider.min.css

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

4 changes: 2 additions & 2 deletions dist/rzslider.min.js

Large diffs are not rendered by default.

15 changes: 10 additions & 5 deletions src/rzslider.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
rightToLeft: false,
boundPointerLabels: true,
mergeRangeLabelsIfSame: false,
customTemplateScope: null
customTemplateScope: null,
showLimitLabels: false
};
var globalOptions = {};

Expand Down Expand Up @@ -318,7 +319,7 @@
this.maxLab = null; // Label above the high value
this.cmbLab = null; // Combined label
this.ticks = null; // The ticks

// Initialize slider
this.init();
};
Expand Down Expand Up @@ -1073,7 +1074,9 @@
};
}

this.shFloorCeil();
if(!this.options.showLimitLabels){
this.shFloorCeil();
}
},

/**
Expand All @@ -1093,8 +1096,10 @@
backgroundColor: pointercolor
};
}

this.shFloorCeil();
if(!this.optionsshowLimitLabels){

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is wrong

this.shFloorCeil();
}

},

/**
Expand Down