Skip to content

Commit 1fe5360

Browse files
committed
Merge pull request #292 from funny-vince/rz-prefix-for-all-classes
Prefix all classes with rz- #272
2 parents 225bc35 + f042240 commit 1fe5360

File tree

9 files changed

+172
-172
lines changed

9 files changed

+172
-172
lines changed

dist/rzslider.css

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*! angularjs-slider - v2.10.2 -
22
(c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> -
33
https://github.com/angular-slider/angularjs-slider -
4-
2016-03-01 */
4+
2016-03-13 */
55
rzslider {
66
position: relative;
77
display: inline-block;
@@ -140,7 +140,7 @@ rzslider .rz-ticks {
140140
justify-content: space-between;
141141
}
142142

143-
rzslider .rz-ticks .tick {
143+
rzslider .rz-ticks .rz-tick {
144144
width: 10px;
145145
height: 10px;
146146
text-align: center;
@@ -149,17 +149,17 @@ rzslider .rz-ticks .tick {
149149
border-radius: 50%;
150150
}
151151

152-
rzslider .rz-ticks .tick.selected {
152+
rzslider .rz-ticks .rz-tick.rz-selected {
153153
background: #0db9f0;
154154
}
155155

156-
rzslider .rz-ticks .tick .tick-value {
156+
rzslider .rz-ticks .rz-tick .rz-tick-value {
157157
position: absolute;
158158
top: -30px;
159159
transform: translate(-50%, 0);
160160
}
161161

162-
rzslider.vertical {
162+
rzslider.rz-vertical {
163163
position: relative;
164164
width: 4px;
165165
height: 100%;
@@ -168,13 +168,13 @@ rzslider.vertical {
168168
vertical-align: baseline;
169169
}
170170

171-
rzslider.vertical .rz-base {
171+
rzslider.rz-vertical .rz-base {
172172
width: 100%;
173173
height: 100%;
174174
padding: 0;
175175
}
176176

177-
rzslider.vertical .rz-bar-wrapper {
177+
rzslider.rz-vertical .rz-bar-wrapper {
178178
top: auto;
179179
left: 0;
180180
width: 32px;
@@ -183,31 +183,31 @@ rzslider.vertical .rz-bar-wrapper {
183183
margin: 0 0 0 -16px;
184184
}
185185

186-
rzslider.vertical .rz-bar {
186+
rzslider.rz-vertical .rz-bar {
187187
bottom: 0;
188188
left: auto;
189189
width: 4px;
190190
height: 100%;
191191
}
192192

193-
rzslider.vertical .rz-pointer {
193+
rzslider.rz-vertical .rz-pointer {
194194
top: auto;
195195
bottom: 0;
196196
left: -14px !important;
197197
}
198198

199-
rzslider.vertical .rz-bubble {
199+
rzslider.rz-vertical .rz-bubble {
200200
bottom: 0;
201201
left: 16px !important;
202202
margin-left: 3px;
203203
}
204204

205-
rzslider.vertical .rz-bubble.rz-selection {
205+
rzslider.rz-vertical .rz-bubble.rz-selection {
206206
top: auto;
207207
left: 16px !important;
208208
}
209209

210-
rzslider.vertical .rz-ticks {
210+
rzslider.rz-vertical .rz-ticks {
211211
top: 0;
212212
left: -3px;
213213
z-index: 1;
@@ -219,11 +219,11 @@ rzslider.vertical .rz-ticks {
219219
flex-direction: column-reverse;
220220
}
221221

222-
rzslider.vertical .rz-ticks .tick {
222+
rzslider.rz-vertical .rz-ticks .rz-tick {
223223
vertical-align: middle;
224224
}
225225

226-
rzslider.vertical .rz-ticks .tick .tick-value {
226+
rzslider.rz-vertical .rz-ticks .rz-tick .rz-tick-value {
227227
top: auto;
228228
right: -30px;
229229
transform: translate(0, -28%);

dist/rzslider.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*! angularjs-slider - v2.10.2 -
22
(c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> -
33
https://github.com/angular-slider/angularjs-slider -
4-
2016-03-01 */
4+
2016-03-13 */
55
/*jslint unparam: true */
66
/*global angular: false, console: false, define, module */
77
(function(root, factory) {
@@ -532,7 +532,7 @@
532532
this.alwaysHide(this.selBar, !this.range && !this.options.showSelectionBar);
533533

534534
if (this.options.vertical)
535-
this.sliderElem.addClass('vertical');
535+
this.sliderElem.addClass('rz-vertical');
536536

537537
if (this.options.draggableRange)
538538
this.selBar.addClass('rz-draggable');
@@ -1879,7 +1879,7 @@
18791879
'use strict';
18801880

18811881
$templateCache.put('rzSliderTpl.html',
1882-
"<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>"
1882+
"<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>"
18831883
);
18841884

18851885
}]);

dist/rzslider.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/rzslider.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/rzSliderTpl.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<span class="rz-bubble"></span> <!-- // 7 Label above right slider handle -->
1111
<span class="rz-bubble"></span> <!-- // 8 Range label when the slider handles are close ex. 15 - 17 -->
1212
<ul ng-show="showTicks" class="rz-ticks"> <!-- // 9 The ticks -->
13-
<li ng-repeat="t in ticks track by $index" class="tick"
14-
ng-class="{selected: t.selected}" ng-style="t.style"
13+
<li ng-repeat="t in ticks track by $index" class="rz-tick"
14+
ng-class="{'rz-selected': t.selected}" ng-style="t.style"
1515
ng-attr-uib-tooltip="{{ t.tooltip }}" ng-attr-tooltip-placement="{{t.tooltipPlacement}}"
1616
ng-attr-tooltip-append-to-body="{{ t.tooltip ? true : undefined}}">
17-
<span ng-if="t.value != null" class="tick-value"
17+
<span ng-if="t.value != null" class="rz-tick-value"
1818
ng-attr-uib-tooltip="{{ t.valueTooltip }}"
1919
ng-attr-tooltip-placement="{{t.valueTooltipPlacement}}">{{ t.value }}</span>
2020
</li>

src/rzslider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@
536536
this.alwaysHide(this.selBar, !this.range && !this.options.showSelectionBar);
537537

538538
if (this.options.vertical)
539-
this.sliderElem.addClass('vertical');
539+
this.sliderElem.addClass('rz-vertical');
540540

541541
if (this.options.draggableRange)
542542
this.selBar.addClass('rz-draggable');

src/rzslider.less

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,25 +133,25 @@ rzslider {
133133
-ms-flex-pack: justify;
134134
justify-content: space-between;
135135

136-
.tick {
136+
.rz-tick {
137137
text-align: center;
138138
cursor: pointer;
139139
width: @ticksWidth;
140140
height: @ticksHeight;
141141
background: @ticksColor;
142142
border-radius: 50%;
143-
&.selected {
143+
&.rz-selected {
144144
background: @selectedTicksColor;
145145
}
146-
.tick-value {
146+
.rz-tick-value {
147147
position: absolute;
148148
top: @ticksValuePosition;
149149
transform: translate(-50%, 0);
150150
}
151151
}
152152
}
153153

154-
&.vertical {
154+
&.rz-vertical {
155155
position: relative;
156156
width: @barDimension;
157157
height: 100%;
@@ -208,9 +208,9 @@ rzslider {
208208
-ms-flex-direction: column-reverse;
209209
flex-direction: column-reverse;
210210

211-
.tick {
211+
.rz-tick {
212212
vertical-align: middle;
213-
.tick-value {
213+
.rz-tick-value {
214214
right: @ticksValuePosition;
215215
top: auto;
216216
transform: translate(0, -28%);

tests/specs/options-handling-test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
expect(helper.element[0].getBoundingClientRect().width).to.equal(1000);
3939
expect(helper.slider.positionProperty).to.equal('left');
4040
expect(helper.slider.dimensionProperty).to.equal('width');
41-
expect(helper.slider.sliderElem.hasClass('vertical')).to.be.false;
41+
expect(helper.slider.sliderElem.hasClass('rz-vertical')).to.be.false;
4242
});
4343

4444
it('vertical slider should take the full height and get correct position/dimension properties', function() {
@@ -48,7 +48,7 @@
4848
expect(helper.element[0].getBoundingClientRect().height).to.equal(1000);
4949
expect(helper.slider.positionProperty).to.equal('bottom');
5050
expect(helper.slider.dimensionProperty).to.equal('height');
51-
expect(helper.slider.sliderElem.hasClass('vertical')).to.be.true;
51+
expect(helper.slider.sliderElem.hasClass('rz-vertical')).to.be.true;
5252
});
5353

5454
it('should prevent invalid step', function() {
@@ -552,7 +552,7 @@
552552
expect(helper.element[0].getBoundingClientRect().width).to.equal(1000);
553553
expect(helper.slider.positionProperty).to.equal('left');
554554
expect(helper.slider.dimensionProperty).to.equal('width');
555-
expect(helper.slider.sliderElem.hasClass('vertical')).to.be.false;
555+
expect(helper.slider.sliderElem.hasClass('rz-vertical')).to.be.false;
556556
});
557557

558558
it('vertical slider should take the full height and get correct position/dimension properties', function() {
@@ -562,7 +562,7 @@
562562
expect(helper.element[0].getBoundingClientRect().height).to.equal(1000);
563563
expect(helper.slider.positionProperty).to.equal('bottom');
564564
expect(helper.slider.dimensionProperty).to.equal('height');
565-
expect(helper.slider.sliderElem.hasClass('vertical')).to.be.true;
565+
expect(helper.slider.sliderElem.hasClass('rz-vertical')).to.be.true;
566566
});
567567

568568
it('should prevent invalid step', function() {

0 commit comments

Comments
 (0)