Merge e2a521f into 8d74043

wieringen · Jul 5, 2016 · a3f624c · a3f624c
2 parents 8d74043 + e2a521f
commit a3f624c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 32 deletions.
diff --git a/lib/jquery.tinycolorpicker.js b/lib/jquery.tinycolorpicker.js
@@ -131,10 +131,10 @@
          * @private
          */
         function _setEvents() {
-            var eventType = touchEvents ? "touchstart" : "mousedown";
+            var eventTypes = touchEvents ? "touchstart mousedown" : "mousedown";
 
             if(hasCanvas) {
-                $color.bind(eventType, function(event) {
+                $color.bind(eventTypes, function(event) {
                     event.preventDefault();
                     event.stopPropagation();
 
@@ -147,26 +147,25 @@
                     });
                 });
 
-                if(!touchEvents) {
-                    $canvas.mousedown(function(event) {
-                        mouseIsDown = true;
-
-                        _getColorCanvas(event);
+                $canvas.mousedown(function(event) {
+                    mouseIsDown = true;
 
-                        $(document).bind("mouseup.colorpicker", function(event) {
-                            $(document).unbind(".colorpicker");
+                    _getColorCanvas(event);
 
-                            self.close();
+                    $(document).bind("mouseup.colorpicker", function(event) {
+                        $(document).unbind(".colorpicker");
 
-                            return false;
-                        });
+                        self.close();
 
                         return false;
                     });
 
-                    $canvas.mousemove(_getColorCanvas);
-                }
-                else {
+                    return false;
+                });
+
+                $canvas.mousemove(_getColorCanvas);
+
+                if(touchEvents) {
                     $canvas.bind("touchstart", function(event) {
                         mouseIsDown = true;
 

diff --git a/lib/tinycolorpicker.js b/lib/tinycolorpicker.js
@@ -125,10 +125,8 @@
          * @private
          */
         function _setEvents() {
-            var eventType = touchEvents ? "touchstart" : "mousedown";
-
             if(hasCanvas) {
-                $color["on" + eventType] = function(event) {
+                $color["ontouchstart"] = $color["onmousedown"] = function(event) {
                     event.preventDefault();
                     event.stopPropagation();
 
@@ -141,27 +139,26 @@
                     };
                 };
 
-                if(!touchEvents) {
-                    $canvas.onmousedown = function(event) {
-                        event.preventDefault();
-                        event.stopPropagation();
+                $canvas.onmousedown = function(event) {
+                    event.preventDefault();
+                    event.stopPropagation();
 
-                        mouseIsDown = true;
+                    mouseIsDown = true;
 
-                        _getColorCanvas(event);
+                    _getColorCanvas(event);
 
-                        document.onmouseup = function(event) {
-                            document.onmouseup = null;
+                    document.onmouseup = function(event) {
+                        document.onmouseup = null;
 
-                            self.close();
+                        self.close();
 
-                            return false;
-                        };
+                        return false;
                     };
+                };
 
-                    $canvas.onmousemove = _getColorCanvas;
-                }
-                else {
+                $canvas.onmousemove = _getColorCanvas;
+
+                if(touchEvents) {
                     $canvas.ontouchstart = function(event) {
                         mouseIsDown = true;