From 8dda2410f300592706985c05141ca6b702977dc0 Mon Sep 17 00:00:00 2001
From: vieron <javiersanchezmarin@gmail.com>
Date: Fri, 25 Oct 2013 20:22:34 +0200
Subject: [PATCH] feat(draggable): pass useful data to all drag callbacks

start/stop/drag callbacks receive: element offset, cursor position,
and references to $player and $helper elements.
---
 src/jquery.draggable.js | 56 ++++++++++++++++++++---------------------
 src/jquery.gridster.js  |  4 +--
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/jquery.draggable.js b/src/jquery.draggable.js
index 03d5d3107..531de70f8 100644
--- a/src/jquery.draggable.js
+++ b/src/jquery.draggable.js
@@ -134,15 +134,30 @@
         }
 
         return {
-            left: left,
-            top: top,
-            mouse_left: mouse_actual_pos.left,
-            mouse_top: mouse_actual_pos.top
+            position: {
+                left: left,
+                top: top
+            },
+            pointer: {
+                left: mouse_actual_pos.left,
+                top: mouse_actual_pos.top,
+                diff_left: diff_x,
+                diff_top: diff_y + this.scrollOffset
+            }
         };
     };
 
 
-    fn.manage_scroll = function(offset) {
+    fn.get_drag_data = function(e) {
+        var offset = this.get_offset(e);
+        offset.$player = this.$player;
+        offset.$helper = this.helper ? this.$helper : this.$player;
+
+        return offset;
+    };
+
+
+    fn.manage_scroll = function(data) {
         /* scroll document */
         var nextScrollTop;
         var scrollTop = $window.scrollTop();
@@ -152,8 +167,8 @@
         var mouse_down_zone = max_window_y - 50;
         var mouse_up_zone = min_window_y + 50;
 
-        var abs_mouse_left = offset.mouse_left;
-        var abs_mouse_top = min_window_y + offset.mouse_top;
+        var abs_mouse_left = data.pointer.left;
+        var abs_mouse_top = min_window_y + data.pointer.top;
 
         var max_player_y = (this.doc_height - this.window_height +
             this.player_height);
@@ -254,18 +269,16 @@
             this.options.offset_left);
 
         if (this.options.start) {
-            this.options.start.call(this.$player, e, {
-                helper: this.helper ? this.$helper : this.$player
-            });
+            this.options.start.call(this.$player, e, this.get_drag_data(e));
         }
         return false;
     };
 
 
     fn.on_dragmove = function(e) {
-        var offset = this.get_offset(e);
+        var data = this.get_drag_data(e);
 
-        this.options.autoscroll && this.manage_scroll(offset);
+        this.options.autoscroll && this.manage_scroll(data);
 
         (this.helper ? this.$helper : this.$player).css({
             'position': 'absolute',
@@ -273,33 +286,20 @@
             'top' : offset.top
         });
 
-        var ui = {
-            'position': {
-                'left': offset.left,
-                'top': offset.top
-            }
-        };
 
         if (this.options.drag) {
-            this.options.drag.call(this.$player, e, ui);
+            this.options.drag.call(this.$player, e, data);
         }
         return false;
     };
 
 
     fn.on_dragstop = function(e) {
-        var offset = this.get_offset(e);
+        var data = this.get_drag_data(e);
         this.drag_start = false;
 
-        var ui = {
-            'position': {
-                'left': offset.left,
-                'top': offset.top
-            }
-        };
-
         if (this.options.stop) {
-            this.options.stop.call(this.$player, e, ui);
+            this.options.stop.call(this.$player, e, data);
         }
 
         if (this.helper) {
diff --git a/src/jquery.gridster.js b/src/jquery.gridster.js
index 49d7af1e7..f16d7f6e5 100644
--- a/src/jquery.gridster.js
+++ b/src/jquery.gridster.js
@@ -671,8 +671,8 @@
                     .removeClass('player-revert');
 
                 self.$player = $(this);
-                self.$helper = self.options.draggable.helper === 'clone' ?
-                    $(ui.helper) : self.$player;
+                self.$helper = $(ui.$helper);
+
                 self.helper = !self.$helper.is(self.$player);
 
                 self.on_start_drag.call(self, event, ui);