Skip to content

I
i20rzslider
Commit f0422402 authored by Vincent D'amour's avatar Vincent D'amour
Browse files
Options

refactor: Prefix all classes with rz- 

Prefix all classes with rz- to avoid conflicts with other CSS classes (e.g. from an other library)

Prefix all classes with rz- #272
parent 225bc351
Expand all Show whitespace changes
Inline Side-by-side
Showing with 172 additions and 172 deletions
dist/rzslider.css
View file @ f0422402
/*! angularjs-slider - v2.10.2 - /*! angularjs-slider - v2.10.2 -
(c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> - (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 - https://github.com/angular-slider/angularjs-slider -
2016-03-01 */ 2016-03-13 */
rzslider { rzslider {
position: relative; position: relative;
display: inline-block; display: inline-block;
...@@ -140,7 +140,7 @@ rzslider .rz-ticks { ...@@ -140,7 +140,7 @@ rzslider .rz-ticks {
justify-content: space-between; justify-content: space-between;
} }
rzslider .rz-ticks .tick { rzslider .rz-ticks .rz-tick {
width: 10px; width: 10px;
height: 10px; height: 10px;
text-align: center; text-align: center;
...@@ -149,17 +149,17 @@ rzslider .rz-ticks .tick { ...@@ -149,17 +149,17 @@ rzslider .rz-ticks .tick {
border-radius: 50%; border-radius: 50%;
} }
rzslider .rz-ticks .tick.selected { rzslider .rz-ticks .rz-tick.rz-selected {
background: #0db9f0; background: #0db9f0;
} }
rzslider .rz-ticks .tick .tick-value { rzslider .rz-ticks .rz-tick .rz-tick-value {
position: absolute; position: absolute;
top: -30px; top: -30px;
transform: translate(-50%, 0); transform: translate(-50%, 0);
} }
rzslider.vertical { rzslider.rz-vertical {
position: relative; position: relative;
width: 4px; width: 4px;
height: 100%; height: 100%;
...@@ -168,13 +168,13 @@ rzslider.vertical { ...@@ -168,13 +168,13 @@ rzslider.vertical {
vertical-align: baseline; vertical-align: baseline;
} }
rzslider.vertical .rz-base { rzslider.rz-vertical .rz-base {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding: 0; padding: 0;
} }
rzslider.vertical .rz-bar-wrapper { rzslider.rz-vertical .rz-bar-wrapper {
top: auto; top: auto;
left: 0; left: 0;
width: 32px; width: 32px;
...@@ -183,31 +183,31 @@ rzslider.vertical .rz-bar-wrapper { ...@@ -183,31 +183,31 @@ rzslider.vertical .rz-bar-wrapper {
margin: 0 0 0 -16px; margin: 0 0 0 -16px;
} }
rzslider.vertical .rz-bar { rzslider.rz-vertical .rz-bar {
bottom: 0; bottom: 0;
left: auto; left: auto;
width: 4px; width: 4px;
height: 100%; height: 100%;
} }
rzslider.vertical .rz-pointer { rzslider.rz-vertical .rz-pointer {
top: auto; top: auto;
bottom: 0; bottom: 0;
left: -14px !important; left: -14px !important;
} }
rzslider.vertical .rz-bubble { rzslider.rz-vertical .rz-bubble {
bottom: 0; bottom: 0;
left: 16px !important; left: 16px !important;
margin-left: 3px; margin-left: 3px;
} }
rzslider.vertical .rz-bubble.rz-selection { rzslider.rz-vertical .rz-bubble.rz-selection {
top: auto; top: auto;
left: 16px !important; left: 16px !important;
} }
rzslider.vertical .rz-ticks { rzslider.rz-vertical .rz-ticks {
top: 0; top: 0;
left: -3px; left: -3px;
z-index: 1; z-index: 1;
...@@ -219,11 +219,11 @@ rzslider.vertical .rz-ticks { ...@@ -219,11 +219,11 @@ rzslider.vertical .rz-ticks {
flex-direction: column-reverse; flex-direction: column-reverse;
} }
rzslider.vertical .rz-ticks .tick { rzslider.rz-vertical .rz-ticks .rz-tick {
vertical-align: middle; vertical-align: middle;
} }
rzslider.vertical .rz-ticks .tick .tick-value { rzslider.rz-vertical .rz-ticks .rz-tick .rz-tick-value {
top: auto; top: auto;
right: -30px; right: -30px;
transform: translate(0, -28%); transform: translate(0, -28%);
......
dist/rzslider.js
View file @ f0422402
/*! angularjs-slider - v2.10.2 - /*! angularjs-slider - v2.10.2 -
(c) Rafal Zajac <rzajac@gmail.com>, Valentin Hervieu <valentin@hervieu.me>, Jussi Saarivirta <jusasi@gmail.com>, Angelin Sirbu <angelin.sirbu@gmail.com> - (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 - https://github.com/angular-slider/angularjs-slider -
2016-03-01 */ 2016-03-13 */
/*jslint unparam: true */ /*jslint unparam: true */
/*global angular: false, console: false, define, module */ /*global angular: false, console: false, define, module */
(function(root, factory) { (function(root, factory) {
...@@ -532,7 +532,7 @@ ...@@ -532,7 +532,7 @@
this.alwaysHide(this.selBar, !this.range && !this.options.showSelectionBar); this.alwaysHide(this.selBar, !this.range && !this.options.showSelectionBar);
if (this.options.vertical) if (this.options.vertical)
this.sliderElem.addClass('vertical'); this.sliderElem.addClass('rz-vertical');
if (this.options.draggableRange) if (this.options.draggableRange)
this.selBar.addClass('rz-draggable'); this.selBar.addClass('rz-draggable');
...@@ -1879,7 +1879,7 @@ ...@@ -1879,7 +1879,7 @@
'use strict'; 'use strict';
$templateCache.put('rzSliderTpl.html', $templateCache.put('rzSliderTpl.html',
"<span class=rz-bar-wrapper><span class=rz-bar></span></span> <span class=rz-bar-wrapper><span class=\"rz-bar rz-selection\" ng-style=barStyle></span></span> <span class=\"rz-pointer rz-pointer-min\" ng-style=minPointerStyle></span> <span class=\"rz-pointer rz-pointer-max\" ng-style=maxPointerStyle></span> <span class=\"rz-bubble rz-limit\"></span> <span class=\"rz-bubble rz-limit\"></span> <span class=rz-bubble></span> <span class=rz-bubble></span> <span class=rz-bubble></span><ul ng-show=showTicks class=rz-ticks><li ng-repeat=\"t in ticks track by $index\" class=tick ng-class=\"{selected: t.selected}\" ng-style=t.style ng-attr-uib-tooltip=\"{{ t.tooltip }}\" ng-attr-tooltip-placement={{t.tooltipPlacement}} ng-attr-tooltip-append-to-body=\"{{ t.tooltip ? true : undefined}}\"><span ng-if=\"t.value != null\" class=tick-value ng-attr-uib-tooltip=\"{{ t.valueTooltip }}\" ng-attr-tooltip-placement={{t.valueTooltipPlacement}}>{{ t.value }}</span></li></ul>" "<span class=rz-bar-wrapper><span class=rz-bar></span></span> <span class=rz-bar-wrapper><span class=\"rz-bar rz-selection\" ng-style=barStyle></span></span> <span class=\"rz-pointer rz-pointer-min\" ng-style=minPointerStyle></span> <span class=\"rz-pointer rz-pointer-max\" ng-style=maxPointerStyle></span> <span class=\"rz-bubble rz-limit\"></span> <span class=\"rz-bubble rz-limit\"></span> <span class=rz-bubble></span> <span class=rz-bubble></span> <span class=rz-bubble></span><ul ng-show=showTicks class=rz-ticks><li ng-repeat=\"t in ticks track by $index\" class=rz-tick ng-class=\"{'rz-selected': t.selected}\" ng-style=t.style ng-attr-uib-tooltip=\"{{ t.tooltip }}\" ng-attr-tooltip-placement={{t.tooltipPlacement}} ng-attr-tooltip-append-to-body=\"{{ t.tooltip ? true : undefined}}\"><span ng-if=\"t.value != null\" class=rz-tick-value ng-attr-uib-tooltip=\"{{ t.valueTooltip }}\" ng-attr-tooltip-placement={{t.valueTooltipPlacement}}>{{ t.value }}</span></li></ul>"
); );
}]); }]);
......
dist/rzslider.min.css
View file @ f0422402
/*! angularjs-slider - v2.10.2 - (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-03-01 */ /*! angularjs-slider - v2.10.2 - (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-03-13 */
rzslider{position:relative;display:inline-block;width:100%;height:4px;margin:35px 0 15px 0;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}rzslider[disabled]{cursor:not-allowed}rzslider[disabled] .rz-pointer{cursor:not-allowed;background-color:#d8e0f3}rzslider span{position:absolute;display:inline-block;white-space:nowrap}rzslider .rz-base{width:100%;height:100%;padding:0}rzslider .rz-bar-wrapper{left:0;z-index:1;width:100%;height:32px;padding-top:16px;margin-top:-16px;box-sizing:border-box}rzslider .rz-bar-wrapper.rz-draggable{cursor:move}rzslider .rz-bar{left:0;z-index:1;width:100%;height:4px;background:#d8e0f3;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider .rz-bar.rz-selection{z-index:2;background:#0db9f0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider .rz-pointer{top:-14px;z-index:3;width:32px;height:32px;cursor:pointer;background-color:#0db9f0;-webkit-border-radius:16px;-moz-border-radius:16px;border-radius:16px}rzslider .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 .rz-pointer:hover:after{background-color:#fff}rzslider .rz-pointer.rz-active{z-index:4}rzslider .rz-pointer.rz-active:after{background-color:#451aff}rzslider .rz-bubble{bottom:16px;padding:1px 3px;color:#55637d;cursor:default}rzslider .rz-bubble.rz-selection{top:16px}rzslider .rz-bubble.rz-limit{color:#55637d}rzslider .rz-ticks{position:absolute;top:-3px;left:0;z-index:1;display:-webkit-flex;display:-ms-flexbox;display:flex;width:100%;height:0;padding:0 11px;margin:0;list-style:none;box-sizing:border-box;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}rzslider .rz-ticks .tick{width:10px;height:10px;text-align:center;cursor:pointer;background:#d8e0f3;border-radius:50%}rzslider .rz-ticks .tick.selected{background:#0db9f0}rzslider .rz-ticks .tick .tick-value{position:absolute;top:-30px;transform:translate(-50%,0)}rzslider.vertical{position:relative;width:4px;height:100%;padding:0;margin:0 20px;vertical-align:baseline}rzslider.vertical .rz-base{width:100%;height:100%;padding:0}rzslider.vertical .rz-bar-wrapper{top:auto;left:0;width:32px;height:100%;padding:0 0 0 16px;margin:0 0 0 -16px}rzslider.vertical .rz-bar{bottom:0;left:auto;width:4px;height:100%}rzslider.vertical .rz-pointer{top:auto;bottom:0;left:-14px!important}rzslider.vertical .rz-bubble{bottom:0;left:16px!important;margin-left:3px}rzslider.vertical .rz-bubble.rz-selection{top:auto;left:16px!important}rzslider.vertical .rz-ticks{top:0;left:-3px;z-index:1;width:0;height:100%;padding:11px 0;-webkit-flex-direction:column-reverse;-ms-flex-direction:column-reverse;flex-direction:column-reverse}rzslider.vertical .rz-ticks .tick{vertical-align:middle}rzslider.vertical .rz-ticks .tick .tick-value{top:auto;right:-30px;transform:translate(0,-28%)} rzslider{position:relative;display:inline-block;width:100%;height:4px;margin:35px 0 15px 0;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}rzslider[disabled]{cursor:not-allowed}rzslider[disabled] .rz-pointer{cursor:not-allowed;background-color:#d8e0f3}rzslider span{position:absolute;display:inline-block;white-space:nowrap}rzslider .rz-base{width:100%;height:100%;padding:0}rzslider .rz-bar-wrapper{left:0;z-index:1;width:100%;height:32px;padding-top:16px;margin-top:-16px;box-sizing:border-box}rzslider .rz-bar-wrapper.rz-draggable{cursor:move}rzslider .rz-bar{left:0;z-index:1;width:100%;height:4px;background:#d8e0f3;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider .rz-bar.rz-selection{z-index:2;background:#0db9f0;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}rzslider .rz-pointer{top:-14px;z-index:3;width:32px;height:32px;cursor:pointer;background-color:#0db9f0;-webkit-border-radius:16px;-moz-border-radius:16px;border-radius:16px}rzslider .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 .rz-pointer:hover:after{background-color:#fff}rzslider .rz-pointer.rz-active{z-index:4}rzslider .rz-pointer.rz-active:after{background-color:#451aff}rzslider .rz-bubble{bottom:16px;padding:1px 3px;color:#55637d;cursor:default}rzslider .rz-bubble.rz-selection{top:16px}rzslider .rz-bubble.rz-limit{color:#55637d}rzslider .rz-ticks{position:absolute;top:-3px;left:0;z-index:1;display:-webkit-flex;display:-ms-flexbox;display:flex;width:100%;height:0;padding:0 11px;margin:0;list-style:none;box-sizing:border-box;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}rzslider .rz-ticks .rz-tick{width:10px;height:10px;text-align:center;cursor:pointer;background:#d8e0f3;border-radius:50%}rzslider .rz-ticks .rz-tick.rz-selected{background:#0db9f0}rzslider .rz-ticks .rz-tick .rz-tick-value{position:absolute;top:-30px;transform:translate(-50%,0)}rzslider.rz-vertical{position:relative;width:4px;height:100%;padding:0;margin:0 20px;vertical-align:baseline}rzslider.rz-vertical .rz-base{width:100%;height:100%;padding:0}rzslider.rz-vertical .rz-bar-wrapper{top:auto;left:0;width:32px;height:100%;padding:0 0 0 16px;margin:0 0 0 -16px}rzslider.rz-vertical .rz-bar{bottom:0;left:auto;width:4px;height:100%}rzslider.rz-vertical .rz-pointer{top:auto;bottom:0;left:-14px!important}rzslider.rz-vertical .rz-bubble{bottom:0;left:16px!important;margin-left:3px}rzslider.rz-vertical .rz-bubble.rz-selection{top:auto;left:16px!important}rzslider.rz-vertical .rz-ticks{top:0;left:-3px;z-index:1;width:0;height:100%;padding:11px 0;-webkit-flex-direction:column-reverse;-ms-flex-direction:column-reverse;flex-direction:column-reverse}rzslider.rz-vertical .rz-ticks .rz-tick{vertical-align:middle}rzslider.rz-vertical .rz-ticks .rz-tick .rz-tick-value{top:auto;right:-30px;transform:translate(0,-28%)}
\ No newline at end of file \ No newline at end of file
dist/rzslider.min.js
View file @ f0422402
This diff is collapsed.
src/rzSliderTpl.html
View file @ f0422402
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
<span class="rz-bubble"></span> <!-- // 7 Label above right 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 --> <span class="rz-bubble"></span> <!-- // 8 Range label when the slider handles are close ex. 15 - 17 -->
<ul ng-show="showTicks" class="rz-ticks"> <!-- // 9 The ticks --> <ul ng-show="showTicks" class="rz-ticks"> <!-- // 9 The ticks -->
<li ng-repeat="t in ticks track by $index" class="tick" <li ng-repeat="t in ticks track by $index" class="rz-tick"
ng-class="{selected: t.selected}" ng-style="t.style" ng-class="{'rz-selected': t.selected}" ng-style="t.style"
ng-attr-uib-tooltip="{{ t.tooltip }}" ng-attr-tooltip-placement="{{t.tooltipPlacement}}" ng-attr-uib-tooltip="{{ t.tooltip }}" ng-attr-tooltip-placement="{{t.tooltipPlacement}}"
ng-attr-tooltip-append-to-body="{{ t.tooltip ? true : undefined}}"> ng-attr-tooltip-append-to-body="{{ t.tooltip ? true : undefined}}">
<span ng-if="t.value != null" class="tick-value" <span ng-if="t.value != null" class="rz-tick-value"
ng-attr-uib-tooltip="{{ t.valueTooltip }}" ng-attr-uib-tooltip="{{ t.valueTooltip }}"
ng-attr-tooltip-placement="{{t.valueTooltipPlacement}}">{{ t.value }}</span> ng-attr-tooltip-placement="{{t.valueTooltipPlacement}}">{{ t.value }}</span>
</li> </li>
......
src/rzslider.js
View file @ f0422402
...@@ -536,7 +536,7 @@ ...@@ -536,7 +536,7 @@
this.alwaysHide(this.selBar, !this.range && !this.options.showSelectionBar); this.alwaysHide(this.selBar, !this.range && !this.options.showSelectionBar);
if (this.options.vertical) if (this.options.vertical)
this.sliderElem.addClass('vertical'); this.sliderElem.addClass('rz-vertical');
if (this.options.draggableRange) if (this.options.draggableRange)
this.selBar.addClass('rz-draggable'); this.selBar.addClass('rz-draggable');
......
src/rzslider.less
View file @ f0422402
...@@ -133,17 +133,17 @@ rzslider { ...@@ -133,17 +133,17 @@ rzslider {
-ms-flex-pack: justify; -ms-flex-pack: justify;
justify-content: space-between; justify-content: space-between;
.tick { .rz-tick {
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
width: @ticksWidth; width: @ticksWidth;
height: @ticksHeight; height: @ticksHeight;
background: @ticksColor; background: @ticksColor;
border-radius: 50%; border-radius: 50%;
&.selected { &.rz-selected {
background: @selectedTicksColor; background: @selectedTicksColor;
} }
.tick-value { .rz-tick-value {
position: absolute; position: absolute;
top: @ticksValuePosition; top: @ticksValuePosition;
transform: translate(-50%, 0); transform: translate(-50%, 0);
...@@ -151,7 +151,7 @@ rzslider { ...@@ -151,7 +151,7 @@ rzslider {
} }
} }
&.vertical { &.rz-vertical {
position: relative; position: relative;
width: @barDimension; width: @barDimension;
height: 100%; height: 100%;
...@@ -208,9 +208,9 @@ rzslider { ...@@ -208,9 +208,9 @@ rzslider {
-ms-flex-direction: column-reverse; -ms-flex-direction: column-reverse;
flex-direction: column-reverse; flex-direction: column-reverse;
.tick { .rz-tick {
vertical-align: middle; vertical-align: middle;
.tick-value { .rz-tick-value {
right: @ticksValuePosition; right: @ticksValuePosition;
top: auto; top: auto;
transform: translate(0, -28%); transform: translate(0, -28%);
......
tests/specs/options-handling-test.js
View file @ f0422402
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
expect(helper.element[0].getBoundingClientRect().width).to.equal(1000); expect(helper.element[0].getBoundingClientRect().width).to.equal(1000);
expect(helper.slider.positionProperty).to.equal('left'); expect(helper.slider.positionProperty).to.equal('left');
expect(helper.slider.dimensionProperty).to.equal('width'); expect(helper.slider.dimensionProperty).to.equal('width');
expect(helper.slider.sliderElem.hasClass('vertical')).to.be.false; expect(helper.slider.sliderElem.hasClass('rz-vertical')).to.be.false;
}); });
it('vertical slider should take the full height and get correct position/dimension properties', function() { it('vertical slider should take the full height and get correct position/dimension properties', function() {
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
expect(helper.element[0].getBoundingClientRect().height).to.equal(1000); expect(helper.element[0].getBoundingClientRect().height).to.equal(1000);
expect(helper.slider.positionProperty).to.equal('bottom'); expect(helper.slider.positionProperty).to.equal('bottom');
expect(helper.slider.dimensionProperty).to.equal('height'); expect(helper.slider.dimensionProperty).to.equal('height');
expect(helper.slider.sliderElem.hasClass('vertical')).to.be.true; expect(helper.slider.sliderElem.hasClass('rz-vertical')).to.be.true;
}); });
it('should prevent invalid step', function() { it('should prevent invalid step', function() {
...@@ -552,7 +552,7 @@ ...@@ -552,7 +552,7 @@
expect(helper.element[0].getBoundingClientRect().width).to.equal(1000); expect(helper.element[0].getBoundingClientRect().width).to.equal(1000);
expect(helper.slider.positionProperty).to.equal('left'); expect(helper.slider.positionProperty).to.equal('left');
expect(helper.slider.dimensionProperty).to.equal('width'); expect(helper.slider.dimensionProperty).to.equal('width');
expect(helper.slider.sliderElem.hasClass('vertical')).to.be.false; expect(helper.slider.sliderElem.hasClass('rz-vertical')).to.be.false;
}); });
it('vertical slider should take the full height and get correct position/dimension properties', function() { it('vertical slider should take the full height and get correct position/dimension properties', function() {
...@@ -562,7 +562,7 @@ ...@@ -562,7 +562,7 @@
expect(helper.element[0].getBoundingClientRect().height).to.equal(1000); expect(helper.element[0].getBoundingClientRect().height).to.equal(1000);
expect(helper.slider.positionProperty).to.equal('bottom'); expect(helper.slider.positionProperty).to.equal('bottom');
expect(helper.slider.dimensionProperty).to.equal('height'); expect(helper.slider.dimensionProperty).to.equal('height');
expect(helper.slider.sliderElem.hasClass('vertical')).to.be.true; expect(helper.slider.sliderElem.hasClass('rz-vertical')).to.be.true;
}); });
it('should prevent invalid step', function() { it('should prevent invalid step', function() {
......
tests/specs/ticks-test.js
View file @ f0422402
This diff is collapsed.
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