Skip to content

I
i20rzslider
Commit 1e1f96ee authored by Rafal Zajac's avatar Rafal Zajac
Browse files
Options

Merge branch 'class-prefixes' of https://github.com/ropsu/angularjs-slider... 

Merge branch 'class-prefixes' of https://github.com/ropsu/angularjs-slider into ropsu-class-prefixes
parents a5ce31a1 7e6821a7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 43 deletions
bower.json
View file @ 1e1f96ee
{
"name": "angularjs-slider",
"version": "0.1.8",
"version": "0.1.9",
"homepage": "https://github.com/rzajac/angularjs-slider",
"authors": [
"Rafal Zajac <rzajac@gmail.com>",
......
dist/rzslider.css
View file @ 1e1f96ee
......@@ -26,13 +26,13 @@ rzslider span {
white-space: nowrap;
}
rzslider span.base {
rzslider span.rz-base {
width: 100%;
height: 100%;
padding: 0;
}
rzslider span.bar {
rzslider span.rz-bar {
z-index: 0;
width: 100%;
height: 100%;
......@@ -42,7 +42,7 @@ rzslider span.bar {
border-radius: 2px;
}
rzslider span.bar.selection {
rzslider span.rz-bar.rz-selection {
z-index: 1;
width: 0;
background: #0db9f0;
......@@ -51,7 +51,7 @@ rzslider span.bar.selection {
border-radius: 2px;
}
rzslider span.pointer {
rzslider span.rz-pointer {
top: -14px;
z-index: 2;
width: 32px;
......@@ -63,7 +63,7 @@ rzslider span.pointer {
border-radius: 16px;
}
rzslider span.pointer:after {
rzslider span.rz-pointer:after {
position: absolute;
top: 12px;
left: 12px;
......@@ -76,25 +76,25 @@ rzslider span.pointer:after {
content: '';
}
rzslider span.pointer:hover:after {
rzslider span.rz-pointer:hover:after {
background-color: #ffffff;
}
rzslider span.pointer.active:after {
rzslider span.rz-pointer.rz-active:after {
background-color: #ffffff;
}
rzslider span.bubble {
rzslider span.rz-bubble {
top: -32px;
padding: 1px 3px;
color: #55637d;
cursor: default;
}
rzslider span.bubble.selection {
rzslider span.rz-bubble.rz-selection {
top: 16px;
}
rzslider span.bubble.limit {
rzslider span.rz-bubble.rz-limit {
color: #55637d;
}
\ No newline at end of file
dist/rzslider.min.css
View file @ 1e1f96ee
/*! jusas-angularjs-slider - v0.1.8 - (c) Rafal Zajac <rzajac@gmail.com>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com>, https://github.com/rzajac/angularjs-slider.git - 2015-05-21 */
rzslider{position:relative;display:inline-block;width:100%;height:4px;margin:30px 0 15px 0;vertical-align:middle}rzslider span{position:absolute;display:inline-block;white-space:nowrap}rzslider span.base{width:100%;height:100%;padding:0}rzslider span.bar{z-index:0;width:100%;height:100%;background:#d8e0f3;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider span.bar.selection{z-index:1;width:0;background:#0db9f0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider span.pointer{top:-14px;z-index:2;width:32px;height:32px;cursor:pointer;background-color:#0db9f0;-webkit-border-radius:16px;-moz-border-radius:16px;border-radius:16px}rzslider span.pointer:after{position:absolute;top:12px;left:12px;width:8px;height:8px;background:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;content:''}rzslider span.pointer:hover:after{background-color:#fff}rzslider span.pointer.active:after{background-color:#fff}rzslider span.bubble{top:-32px;padding:1px 3px;color:#55637d;cursor:default}rzslider span.bubble.selection{top:16px}rzslider span.bubble.limit{color:#55637d}
\ No newline at end of file
/*! jusas-angularjs-slider - v0.1.9 - (c) Rafal Zajac <rzajac@gmail.com>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com>, https://github.com/rzajac/angularjs-slider.git - 2015-05-21 */
rzslider{position:relative;display:inline-block;width:100%;height:4px;margin:30px 0 15px 0;vertical-align:middle}rzslider span{position:absolute;display:inline-block;white-space:nowrap}rzslider span.rz-base{width:100%;height:100%;padding:0}rzslider span.rz-bar{z-index:0;width:100%;height:100%;background:#d8e0f3;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider span.rz-bar.rz-selection{z-index:1;width:0;background:#0db9f0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider span.rz-pointer{top:-14px;z-index:2;width:32px;height:32px;cursor:pointer;background-color:#0db9f0;-webkit-border-radius:16px;-moz-border-radius:16px;border-radius:16px}rzslider span.rz-pointer:after{position:absolute;top:12px;left:12px;width:8px;height:8px;background:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;content:''}rzslider span.rz-pointer:hover:after{background-color:#fff}rzslider span.rz-pointer.rz-active:after{background-color:#fff}rzslider span.rz-bubble{top:-32px;padding:1px 3px;color:#55637d;cursor:default}rzslider span.rz-bubble.rz-selection{top:16px}rzslider span.rz-bubble.rz-limit{color:#55637d}
\ No newline at end of file
dist/rzslider.min.js
View file @ 1e1f96ee
This diff is collapsed.
package.json
View file @ 1e1f96ee
{
"name": "jusas-angularjs-slider",
"version": "0.1.8",
"version": "0.1.9",
"description": "AngularJS slider directive with no external dependencies. Mobile friendly!.",
"main": "rzslider.js",
"repository": {
......
rzslider.js
View file @ 1e1f96ee
......@@ -4,7 +4,7 @@
* (c) Rafal Zajac <rzajac@gmail.com>
* http://github.com/rzajac/angularjs-slider
*
* Version: v0.1.6
* Version: v0.1.9
*
* Licensed under the MIT license
*/
......@@ -780,7 +780,7 @@ function throttle(func, wait, options) {
this.calcViewDimensions();
this.tracking = ref;
pointer.addClass('active');
pointer.addClass('rz-active');
if(event.touches || (typeof(event.originalEvent) != 'undefined' && event.originalEvent.touches))
{
......@@ -842,16 +842,16 @@ function throttle(func, wait, options) {
this.scope[this.tracking] = this.scope.rzSliderHigh;
this.updateHandles(this.tracking, this.maxH.rzsl);
this.tracking = 'rzSliderHigh';
this.minH.removeClass('active');
this.maxH.addClass('active');
this.minH.removeClass('rz-active');
this.maxH.addClass('rz-active');
}
else if(this.tracking === 'rzSliderHigh' && newValue <= this.scope.rzSliderModel)
{
this.scope[this.tracking] = this.scope.rzSliderModel;
this.updateHandles(this.tracking, this.minH.rzsl);
this.tracking = 'rzSliderModel';
this.maxH.removeClass('active');
this.minH.addClass('active');
this.maxH.removeClass('rz-active');
this.minH.addClass('rz-active');
}
}
......@@ -871,8 +871,8 @@ function throttle(func, wait, options) {
*/
onEnd: function(event)
{
this.minH.removeClass('active');
this.maxH.removeClass('active');
this.minH.removeClass('rz-active');
this.maxH.removeClass('rz-active');
if(event.touches || (typeof(event.originalEvent) != 'undefined' && event.originalEvent.touches))
{
......@@ -907,15 +907,15 @@ function throttle(func, wait, options) {
rzSliderHigh: '=?',
rzSliderTranslate: '&'
},
template: '<span class="bar"></span>' + // 0 The slider bar
'<span class="bar selection"></span>' + // 1 Highlight between two handles
'<span class="pointer"></span>' + // 2 Left slider handle
'<span class="pointer"></span>' + // 3 Right slider handle
'<span class="bubble limit"></span>' + // 4 Floor label
'<span class="bubble limit"></span>' + // 5 Ceiling label
'<span class="bubble"></span>' + // 6 Label above left slider handle
'<span class="bubble"></span>' + // 7 Label above right slider handle
'<span class="bubble"></span>', // 8 Range label when the slider handles are close ex. 15 - 17
template: '<span class="rz-bar"></span>' + // 0 The slider bar
'<span class="rz-bar rz-selection"></span>' + // 1 Highlight between two handles
'<span class="rz-pointer"></span>' + // 2 Left slider handle
'<span class="rz-pointer"></span>' + // 3 Right slider handle
'<span class="rz-bubble rz-limit"></span>' + // 4 Floor label
'<span class="rz-bubble rz-limit"></span>' + // 5 Ceiling label
'<span class="rz-bubble"></span>' + // 6 Label above left slider handle
'<span class="rz-bubble"></span>' + // 7 Label above right slider handle
'<span class="rz-bubble"></span>', // 8 Range label when the slider handles are close ex. 15 - 17
link: function(scope, elem, attr)
{
......
rzslider.less
View file @ 1e1f96ee
......@@ -44,13 +44,13 @@ rzslider span {
display: inline-block;
}
rzslider span.base {
rzslider span.rz-base {
width: 100%;
height: 100%;
padding: 0;
}
rzslider span.bar {
rzslider span.rz-bar {
width: 100%;
height: 100%;
z-index: 0;
......@@ -58,14 +58,14 @@ rzslider span.bar {
.rounded(@barHeight/2);
}
rzslider span.bar.selection {
rzslider span.rz-bar.rz-selection {
width: 0%;
z-index: 1;
background: @barFillColor;
.rounded(@barHeight/2);
}
rzslider span.pointer {
rzslider span.rz-pointer {
cursor: pointer;
width: @handleSize;
height: @handleSize;
......@@ -75,7 +75,7 @@ rzslider span.pointer {
.rounded(@handleSize/2);
}
rzslider span.pointer:after {
rzslider span.rz-pointer:after {
content: '';
width: @handlePointerSize;
height: @handlePointerSize;
......@@ -86,25 +86,25 @@ rzslider span.pointer:after {
background: @handleInnerColor;
}
rzslider span.pointer:hover:after {
rzslider span.rz-pointer:hover:after {
background-color: @handleHoverColor;
}
rzslider span.pointer.active:after {
rzslider span.rz-pointer.rz-active:after {
background-color: @handleActiveColor;
}
rzslider span.bubble {
rzslider span.rz-bubble {
cursor: default;
top: -@handleSize;
padding: @bubblePadding;
color: @labelTextColor;
}
rzslider span.bubble.selection {
rzslider span.rz-bubble.rz-selection {
top: @handleSize/2;
}
rzslider span.bubble.limit {
rzslider span.rz-bubble.rz-limit {
color: @limitLabelTextColor;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment