Merge branch 'Alkpone-master'

dist/rzslider.min.css

-/*! jusas-angularjs-slider - v0.1.5 - (c) Rafal Zajac <rzajac@gmail.com>, Jussi Saarivirta <jusasi@gmail.com>, https://github.com/rzajac/angularjs-slider.git - 2014-06-10 */
+/*! jusas-angularjs-slider - v0.1.5 - (c) Rafal Zajac <rzajac@gmail.com>, Jussi Saarivirta <jusasi@gmail.com>, https://github.com/rzajac/angularjs-slider.git - 2014-07-08 */
 rzslider{position:relative;display:inline-block;width:100%;height:2px;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:#fff}rzslider span.bar.selection{z-index:1;width:0;background:#67b700}rzslider span.pointer{top:-15px;z-index:2;width:32px;height:32px;cursor:pointer;background-color:#fff;-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:#71818e;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;content:''}rzslider span.pointer:hover:after{background-color:#67b700}rzslider span.pointer.active:after{background-color:#67b700}rzslider span.bubble{top:-32px;padding:1px 3px 1px 3px;color:#67b700;cursor:default}rzslider span.bubble.selection{top:15px}rzslider span.bubble.limit{color:#67b700}
\ No newline at end of file

rzslider.js

@@ -784,13 +784,13 @@ function throttle(func, wait, options) {
 
       if(event.touches || (typeof(event.originalEvent) != 'undefined' && event.originalEvent.touches))
       {
-        $document.on('touchmove', angular.bind(this, this.onMove, pointer));
-        $document.on('touchend', angular.bind(this, this.onEnd));
+        $document.on('touchmove.rzslider', angular.bind(this, this.onMove, pointer));
+        $document.on('touchend.rzslider', angular.bind(this, this.onEnd));
       }
       else
       {
-        $document.on('mousemove', angular.bind(this, this.onMove, pointer));
-        $document.on('mouseup', angular.bind(this, this.onEnd));
+        $document.on('mousemove.rzslider', angular.bind(this, this.onMove, pointer));
+        $document.on('mouseup.rzslider', angular.bind(this, this.onEnd));
       }
     },
 
@@ -876,13 +876,13 @@ function throttle(func, wait, options) {
 
       if(event.touches || (typeof(event.originalEvent) != 'undefined' && event.originalEvent.touches))
       {
-        $document.unbind('touchmove');
-        $document.unbind('touchend');        
+        $document.unbind('touchmove.rzslider');
+        $document.unbind('touchend.rzslider');
       }
       else
       {
-        $document.unbind('mousemove');
-        $document.unbind('mouseup');
+        $document.unbind('mousemove.rzslider');
+        $document.unbind('mouseup.rzslider');
       }
 
       this.scope.$emit('slideEnded');