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

Author: rzajac

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angularjs-slider",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "homepage": "https://github.com/rzajac/angularjs-slider",
   "authors": [
     "Rafal Zajac <[email protected]>",

dist/rzslider.css

@@ -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;
 }

dist/rzslider.min.css

@@ -1,6 +1,6 @@
 {
   "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": {

dist/rzslider.min.js

@@ -4,7 +4,7 @@
  * (c) Rafal Zajac <[email protected]>
  * 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)
     {

package.json

@@ -44,28 +44,28 @@ 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;
   background: @barNormalColor;
   .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;
 }