JQ droppable fix for website

adumesny · adumesny · commit e4893a8ac149 · 2021-05-31T07:50:46.000-07:00
diff --git a/demo/web1.html b/demo/web1.html
@@ -13,7 +13,7 @@
   <script type="module" src="https://unpkg.com/ionicons@4.5.10-0/dist/ionicons/ionicons.esm.js"></script>
   <script nomodule="" src="https://unpkg.com/ionicons@4.5.10-0/dist/ionicons/ionicons.js"></script>
 
-  <script src="../dist/gridstack-h5.js"></script>
+  <script src="../dist/gridstack-jq.js"></script>
 </head>
 
 <body>
diff --git a/demo/web2.html b/demo/web2.html
@@ -13,7 +13,7 @@
   <script type="module" src="https://unpkg.com/ionicons@4.5.10-0/dist/ionicons/ionicons.esm.js"></script>
   <script nomodule="" src="https://unpkg.com/ionicons@4.5.10-0/dist/ionicons/ionicons.js"></script>
 
-  <script src="../dist/gridstack-h5.js"></script>
+  <script src="../dist/gridstack-jq.js"></script>
 
   <style type="text/css">
     .grid-stack-item-removing {
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -5,6 +5,7 @@ Change log
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
 
+- [4.2.5 (2021-5-31)](#425-2021-5-31)
 - [4.2.4 (2021-5-29)](#424-2021-5-29)
 - [4.2.3 (2021-5-8)](#423-2021-5-8)
 - [4.2.2 (2021-4-23)](#422-2021-4-23)
@@ -57,6 +58,10 @@ Change log
 - [v0.1.0 (2014-11-18)](#v010-2014-11-18)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
+## 4.2.5 (2021-5-31)
+
+* fix for website with JQ `droppable('destroy')` giving error
+
 ## 4.2.4 (2021-5-29)
 
 * fix [#1760](https://github.com/gridstack/gridstack.js/issues/1760) `removable:true` working again (broke in 4.x)
diff --git a/src/jq/gridstack-dd-jqueryui.ts b/src/jq/gridstack-dd-jqueryui.ts
@@ -90,7 +90,13 @@ export class GridStackDDJQueryUI extends GridStackDD {
       opts._accept = opts.accept;
       opts.accept = ($el: JQuery) => opts._accept($el.get(0));
     }
-    $el.droppable(opts, key, value);
+    if (opts === 'disable' || opts === 'destroy') {
+      if ($el.data('ui-droppable')) { // error to call destroy if not there
+        $el.droppable(opts);
+      }
+    } else {
+      $el.droppable(opts, key, value);
+    }
     return this;
   }
 

-Original file line number
+Diff line change
   <script type="module" src="https://unpkg.com/[email protected]/dist/ionicons/ionicons.esm.js"></script>
   <script nomodule="" src="https://unpkg.com/[email protected]/dist/ionicons/ionicons.js"></script>
 -  <script src="../dist/gridstack-h5.js"></script>
 +  <script src="../dist/gridstack-jq.js"></script>
 </head>
 <body>
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,13 @@ export class GridStackDDJQueryUI extends GridStackDD {`
`90`	`90`	`opts._accept = opts.accept;`
`91`	`91`	`opts.accept = ($el: JQuery) => opts._accept($el.get(0));`
`92`	`92`	`}`
`93`		`- $el.droppable(opts, key, value);`
	`93`	`+ if (opts === 'disable' \|\| opts === 'destroy') {`
	`94`	`+ if ($el.data('ui-droppable')) { // error to call destroy if not there`
	`95`	`+ $el.droppable(opts);`
	`96`	`+ }`
	`97`	`+ } else {`
	`98`	`+ $el.droppable(opts, key, value);`
	`99`	`+ }`
`94`	`100`	`return this;`
`95`	`101`	`}`
`96`	`102`