summaryrefslogtreecommitdiffstats
path: root/slick.grid.js
diff options
context:
space:
mode:
authormleibman <michael.leibman@gmail.com>2010-11-02 15:11:34 -0700
committermleibman <michael.leibman@gmail.com>2010-11-02 15:11:34 -0700
commit4505a9467f156ca244e32ae01d39acfd9f9d7623 (patch)
tree9038d7cdbf1171b5206bf6f36e6b9471b7e76c66 /slick.grid.js
parentbf70c2475736e729f4602a03239aabce938dff59 (diff)
downloadSlickGrid-4505a9467f156ca244e32ae01d39acfd9f9d7623.zip
SlickGrid-4505a9467f156ca244e32ae01d39acfd9f9d7623.tar.gz
SlickGrid-4505a9467f156ca244e32ae01d39acfd9f9d7623.tar.bz2
FIXED: Issue 100 - Error thrown when grid with enableColumnReorder set to false is destroyed. http://github.com/mleibman/SlickGrid/issues#issue/100.
Diffstat (limited to 'slick.grid.js')
-rw-r--r--slick.grid.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/slick.grid.js b/slick.grid.js
index 1949dfc..13b8a7a 100644
--- a/slick.grid.js
+++ b/slick.grid.js
@@ -947,8 +947,12 @@ if (!jQuery.fn.drag) {
function destroy() {
options.editorLock.cancelCurrentEdit();
- if (self.onBeforeDestroy) { self.onBeforeDestroy(); }
- if ($headers.sortable) { $headers.sortable("destroy"); }
+ if (self.onBeforeDestroy)
+ self.onBeforeDestroy();
+
+ if (options.enableColumnReorder && $headers.sortable)
+ $headers.sortable("destroy");
+
unbindAncestorScrollEvents();
$container.unbind(".slickgrid");
removeCssRules();