Skip to content

Added the option for having fixed label to the directive #405

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
ValentinH merged 4 commits into from
Sep 6, 2016
Merged

Added the option for having fixed label to the directive #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bebd4af
Added the option for havind fixed label to the directive
Aug 25, 2016
7a24fd0
Committed the dist folder too
Aug 25, 2016
6438926
Changed the showLimit labels to autoHideLabels property
Sep 1, 2016
2c29a06
#Updated the dist by running the grunt task
Sep 6, 2016
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! angularjs-slider - v5.4.3 -
(c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> -
https://github.com/angular-slider/angularjs-slider -
2016-08-07 */
2016-09-06 */
.rzslider {
position: relative;
display: inline-block;
Expand Down
17 changes: 11 additions & 6 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 - v5.4.3 -
(c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> -
https://github.com/angular-slider/angularjs-slider -
2016-08-07 */
2016-09-06 */
/*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,
autoHideLabels: true
};
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.autoHideLabels){
this.shFloorCeil();
}
},

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

this.shFloorCeil();
if(this.options.autoHideLabels){
this.shFloorCeil();
}

},

/**
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.

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

Large diffs are not rendered by default.

15 changes: 10 additions & 5 deletions src/rzslider.js
View file
Open in desktop
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,
autoHideLabels: true
};
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.autoHideLabels){
this.shFloorCeil();
}
},

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

this.shFloorCeil();
if(this.options.autoHideLabels){
this.shFloorCeil();
}

},

/**
Expand Down