From 374d30d544a05143914ea070ebc3ec4543e2bf23 Mon Sep 17 00:00:00 2001
From: Job Bakker <job.bakker@geodan.nl>
Date: Tue, 5 Jul 2016 10:46:17 +0200
Subject: [PATCH 1/2] Also add mouse listener when a touch screen is detected

---
 lib/jquery.tinycolorpicker.js | 31 +++++++++++++++----------------
 lib/tinycolorpicker.js        | 31 ++++++++++++++-----------------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/lib/jquery.tinycolorpicker.js b/lib/jquery.tinycolorpicker.js
index 2ccabdc..2cc51ee 100644
--- a/lib/jquery.tinycolorpicker.js
+++ b/lib/jquery.tinycolorpicker.js
@@ -131,42 +131,41 @@
          * @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();
 
                     $track.toggle();
 
-                    $(document).bind("mousedown.colorpicker", function(event) {
+                    $(document).bind("mousedown.colorpicker", function (event) {
                         $(document).unbind(".colorpicker");
 
                         self.close();
                     });
                 });
 
-                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
index 0fe0fdf..37e890b 100644
--- 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;
 

From e2a521fc2d4930dcd5e72c7b55ca1c8332ed9ba4 Mon Sep 17 00:00:00 2001
From: Job Bakker <job.bakker@geodan.nl>
Date: Tue, 5 Jul 2016 10:51:59 +0200
Subject: [PATCH 2/2] Deleted some spaces to be consistent

---
 lib/jquery.tinycolorpicker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jquery.tinycolorpicker.js b/lib/jquery.tinycolorpicker.js
index 2cc51ee..67e7f78 100644
--- a/lib/jquery.tinycolorpicker.js
+++ b/lib/jquery.tinycolorpicker.js
@@ -134,13 +134,13 @@
             var eventTypes = touchEvents ? "touchstart mousedown" : "mousedown";
 
             if(hasCanvas) {
-                $color.bind(eventTypes, function (event) {
+                $color.bind(eventTypes, function(event) {
                     event.preventDefault();
                     event.stopPropagation();
 
                     $track.toggle();
 
-                    $(document).bind("mousedown.colorpicker", function (event) {
+                    $(document).bind("mousedown.colorpicker", function(event) {
                         $(document).unbind(".colorpicker");
 
                         self.close();