From 021a6c23e851210c1b817bd353a1e5e19ce10b90 Mon Sep 17 00:00:00 2001
From: vieron <javiersanchezmarin@gmail.com>
Date: Mon, 16 Jun 2014 10:43:54 +0200
Subject: [PATCH] fix(draggable): handle both touch and click events

Fixes #207, #236, #329, and #380
---
 src/jquery.draggable.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/jquery.draggable.js b/src/jquery.draggable.js
index dabcad9f0..a03d4eae5 100644
--- a/src/jquery.draggable.js
+++ b/src/jquery.draggable.js
@@ -29,9 +29,9 @@
     var dir_map = { x : 'left', y : 'top' };
     var isTouch = !!('ontouchstart' in window);
     var pointer_events = {
-        start: isTouch ? 'touchstart.gridster-draggable' : 'mousedown.gridster-draggable',
-        move: isTouch ? 'touchmove.gridster-draggable' : 'mousemove.gridster-draggable',
-        end: isTouch ? 'touchend.gridster-draggable' : 'mouseup.gridster-draggable'
+        start: 'touchstart.gridster-draggable mousedown.gridster-draggable',
+        move: 'touchmove.gridster-draggable mousemove.gridster-draggable',
+        end: 'touchend.gridster-draggable mouseup.gridster-draggable'
     };
 
     var capitalize = function(str) {
@@ -111,7 +111,7 @@
 
 
     fn.get_mouse_pos = function(e) {
-        if (isTouch) {
+        if (e.originalEvent && e.originalEvent.touches) {
             var oe = e.originalEvent;
             e = oe.touches.length ? oe.touches[0] : oe.changedTouches[0];
         }
@@ -235,6 +235,7 @@
 
     fn.drag_handler = function(e) {
         var node = e.target.nodeName;
+        // skip if drag is disabled, or click was not done with the mouse primary button
         if (this.disabled || e.which !== 1 && !isTouch) {
             return;
         }