From d78bd254bd8e162ae113a7bb6c71b539eaf78728 Mon Sep 17 00:00:00 2001
From: vieron <javiersanchezmarin@gmail.com>
Date: Wed, 8 Aug 2012 23:33:31 +0200
Subject: [PATCH] renamed jQuery adapter for Draggable class to $.fn.drag.
 Fixes #17.

Prevents name collisions with jQuery UI draggable module.
---
 src/jquery.draggable.js | 6 +++---
 src/jquery.gridster.js  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/jquery.draggable.js b/src/jquery.draggable.js
index 1225ae20a..52a18d4f3 100644
--- a/src/jquery.draggable.js
+++ b/src/jquery.draggable.js
@@ -315,10 +315,10 @@
 
 
     //jQuery adapter
-    $.fn.draggable = function ( options ) {
+    $.fn.drag = function ( options ) {
         return this.each(function () {
-            if (!$.data(this, 'draggable')) {
-                $.data(this, 'draggable', new Draggable( this, options ));
+            if (!$.data(this, 'drag')) {
+                $.data(this, 'drag', new Draggable( this, options ));
             }
         });
     };
diff --git a/src/jquery.gridster.js b/src/jquery.gridster.js
index 4de1488f6..26f32b6b2 100644
--- a/src/jquery.gridster.js
+++ b/src/jquery.gridster.js
@@ -410,7 +410,7 @@
             }, 60)
           });
 
-        this.drag_api = this.$el.draggable(draggable_options).data('draggable');
+        this.drag_api = this.$el.drag(draggable_options).data('draggable');
         return this;
     };