Fixed a minor issue when trying to destroy a non existing drag_api

dustmoo · Feb 15, 2013 · 7f3f679 · 7f3f679
1 parent 7217b04
commit 7f3f679
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/dist/jquery.gridster.js b/dist/jquery.gridster.js
@@ -3236,11 +3236,12 @@
      */
     fn.destroy = function(){
         // remove bound callback on window resize
-        $(window).unbind('resize', this.resize_callback);
-
-        // TODO: remove draggable bindings
-        this.drag_api.destroy();
+        $(window).unbind('resize', this.on_window_resize);
 
+        if(this.drag_api){
+            this.drag_api.destroy();
+        }
+
         // lastly, remove gridster element
         // this will additionally cause any data associated to this element to be removed, including this
         // very gridster instance

diff --git a/dist/jquery.gridster.min.js b/dist/jquery.gridster.min.js
diff --git a/dist/jquery.gridster.with-extras.js b/dist/jquery.gridster.with-extras.js
@@ -3236,11 +3236,12 @@
      */
     fn.destroy = function(){
         // remove bound callback on window resize
-        $(window).unbind('resize', this.resize_callback);
-
-        // TODO: remove draggable bindings
-        this.drag_api.destroy();
+        $(window).unbind('resize', this.on_window_resize);
 
+        if(this.drag_api){
+            this.drag_api.destroy();
+        }
+
         // lastly, remove gridster element
         // this will additionally cause any data associated to this element to be removed, including this
         // very gridster instance

diff --git a/dist/jquery.gridster.with-extras.min.js b/dist/jquery.gridster.with-extras.min.js
diff --git a/src/jquery.gridster.js b/src/jquery.gridster.js
@@ -2531,9 +2531,10 @@
         // remove bound callback on window resize
         $(window).unbind('resize', this.on_window_resize);
 
-        // TODO: remove draggable bindings
-        this.drag_api.destroy();
-
+        if(this.drag_api){
+            this.drag_api.destroy();
+        }
+
         // lastly, remove gridster element
         // this will additionally cause any data associated to this element to be removed, including this
         // very gridster instance