From e4893a8ac1490513bc92ea084ebd0178d13dc785 Mon Sep 17 00:00:00 2001
From: Alain Dumesny <alaind831+github@gmail.com>
Date: Mon, 31 May 2021 07:50:46 -0700
Subject: [PATCH 1/2] JQ droppable fix for website

---
 demo/web1.html                  | 2 +-
 demo/web2.html                  | 2 +-
 doc/CHANGES.md                  | 5 +++++
 src/jq/gridstack-dd-jqueryui.ts | 8 +++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/demo/web1.html b/demo/web1.html
index c0cc28468..a7f7193ea 100644
--- 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
index f0079a2c4..9a3a28811 100644
--- 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
index 96d0ebb66..91badd499 100644
--- 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
index d08a586dd..e7f1df7b3 100644
--- 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;
   }
 

From d06d15acc6c13a1a8efb3e073d1b2a477c690cce Mon Sep 17 00:00:00 2001
From: Alain Dumesny <alaind831+github@gmail.com>
Date: Mon, 31 May 2021 07:51:31 -0700
Subject: [PATCH 2/2] rev 4.2.5

---
 package.json                    | 2 +-
 src/gridstack-dd.ts             | 2 +-
 src/gridstack-ddi.ts            | 2 +-
 src/gridstack-engine.ts         | 2 +-
 src/gridstack-h5.ts             | 2 +-
 src/gridstack-jq.ts             | 2 +-
 src/gridstack-poly.js           | 2 +-
 src/gridstack-static.ts         | 2 +-
 src/gridstack.scss              | 2 +-
 src/gridstack.ts                | 2 +-
 src/h5/dd-base-impl.ts          | 2 +-
 src/h5/dd-draggable.ts          | 2 +-
 src/h5/dd-droppable.ts          | 2 +-
 src/h5/dd-element.ts            | 2 +-
 src/h5/dd-manager.ts            | 2 +-
 src/h5/dd-resizable-handle.ts   | 2 +-
 src/h5/dd-resizable.ts          | 2 +-
 src/h5/dd-utils.ts              | 2 +-
 src/h5/gridstack-dd-native.ts   | 2 +-
 src/jq/gridstack-dd-jqueryui.ts | 2 +-
 src/types.ts                    | 2 +-
 src/utils.ts                    | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index b1e6ac0c0..da2dbcd1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "4.2.4-dev",
+  "version": "4.2.5",
   "description": "TypeScript/JS lib for dashboard layout and creation, no external dependencies, with many wrappers (React, Angular, Vue, Ember, knockout...)",
   "main": "./dist/gridstack.js",
   "types": "./dist/gridstack.d.ts",
diff --git a/src/gridstack-dd.ts b/src/gridstack-dd.ts
index dc9814514..3170daadc 100644
--- a/src/gridstack-dd.ts
+++ b/src/gridstack-dd.ts
@@ -1,5 +1,5 @@
 /**
- * gridstack-dd.ts 4.2.4-dev
+ * gridstack-dd.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack-ddi.ts b/src/gridstack-ddi.ts
index 0b9fd8fd9..55160d6ce 100644
--- a/src/gridstack-ddi.ts
+++ b/src/gridstack-ddi.ts
@@ -1,5 +1,5 @@
 /**
- * gridstack-ddi.ts 4.2.4-dev
+ * gridstack-ddi.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack-engine.ts b/src/gridstack-engine.ts
index 71e67d97c..08d2b8f40 100644
--- a/src/gridstack-engine.ts
+++ b/src/gridstack-engine.ts
@@ -1,5 +1,5 @@
 /**
- * gridstack-engine.ts 4.2.4-dev
+ * gridstack-engine.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack-h5.ts b/src/gridstack-h5.ts
index a1645ab62..b800bb737 100644
--- a/src/gridstack-h5.ts
+++ b/src/gridstack-h5.ts
@@ -1,5 +1,5 @@
 /**
- * index-h5.ts 4.2.4-dev - everything you need for a Grid that uses HTML5 native drag&drop
+ * index-h5.ts 4.2.5 - everything you need for a Grid that uses HTML5 native drag&drop
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack-jq.ts b/src/gridstack-jq.ts
index b2c1a7c78..abfe9afa1 100644
--- a/src/gridstack-jq.ts
+++ b/src/gridstack-jq.ts
@@ -1,5 +1,5 @@
 /**
- * index-jq.ts 4.2.4-dev - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature)
+ * index-jq.ts 4.2.5 - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature)
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack-poly.js b/src/gridstack-poly.js
index 32448171e..21836bb61 100644
--- a/src/gridstack-poly.js
+++ b/src/gridstack-poly.js
@@ -1,5 +1,5 @@
 /**
- * gridstack-poly.ts 4.2.4-dev - used for older browser support (not currently supported in v2+)
+ * gridstack-poly.ts 4.2.5 - used for older browser support (not currently supported in v2+)
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack-static.ts b/src/gridstack-static.ts
index f323a4a5d..d91b2e933 100644
--- a/src/gridstack-static.ts
+++ b/src/gridstack-static.ts
@@ -1,5 +1,5 @@
 /**
- * index-static.ts 4.2.4-dev - much smaller, everything you need for a static Grid (non draggable, API driven)
+ * index-static.ts 4.2.5 - much smaller, everything you need for a static Grid (non draggable, API driven)
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack.scss b/src/gridstack.scss
index a1c706e82..e071ab590 100644
--- a/src/gridstack.scss
+++ b/src/gridstack.scss
@@ -1,5 +1,5 @@
 /**
- * gridstack SASS styles 4.2.4-dev
+ * gridstack SASS styles 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack.ts b/src/gridstack.ts
index 87fc354f5..10d444371 100644
--- a/src/gridstack.ts
+++ b/src/gridstack.ts
@@ -1,5 +1,5 @@
 /*!
- * GridStack 4.2.4-dev
+ * GridStack 4.2.5
  * https://gridstackjs.com/
  *
  * Copyright (c) 2021 Alain Dumesny
diff --git a/src/h5/dd-base-impl.ts b/src/h5/dd-base-impl.ts
index 30f33751e..0aae58c24 100644
--- a/src/h5/dd-base-impl.ts
+++ b/src/h5/dd-base-impl.ts
@@ -1,5 +1,5 @@
 /**
- * dd-base-impl.ts 4.2.4-dev
+ * dd-base-impl.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/h5/dd-draggable.ts b/src/h5/dd-draggable.ts
index 683fb1dec..bd6dd90cb 100644
--- a/src/h5/dd-draggable.ts
+++ b/src/h5/dd-draggable.ts
@@ -1,5 +1,5 @@
 /**
- * dd-draggable.ts 4.2.4-dev
+ * dd-draggable.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/h5/dd-droppable.ts b/src/h5/dd-droppable.ts
index 9def9628f..4bac18188 100644
--- a/src/h5/dd-droppable.ts
+++ b/src/h5/dd-droppable.ts
@@ -1,5 +1,5 @@
 /**
- * dd-droppable.ts 4.2.4-dev
+ * dd-droppable.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/h5/dd-element.ts b/src/h5/dd-element.ts
index b1c201f92..d91b84a2a 100644
--- a/src/h5/dd-element.ts
+++ b/src/h5/dd-element.ts
@@ -1,5 +1,5 @@
 /**
- * dd-elements.ts 4.2.4-dev
+ * dd-elements.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/h5/dd-manager.ts b/src/h5/dd-manager.ts
index 46b69827e..68775d29a 100644
--- a/src/h5/dd-manager.ts
+++ b/src/h5/dd-manager.ts
@@ -1,5 +1,5 @@
 /**
- * dd-manager.ts 4.2.4-dev
+ * dd-manager.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/h5/dd-resizable-handle.ts b/src/h5/dd-resizable-handle.ts
index f197d5872..4c1ce1f7b 100644
--- a/src/h5/dd-resizable-handle.ts
+++ b/src/h5/dd-resizable-handle.ts
@@ -1,5 +1,5 @@
 /**
- * dd-resizable-handle.ts 4.2.4-dev
+ * dd-resizable-handle.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/h5/dd-resizable.ts b/src/h5/dd-resizable.ts
index a22cc9bde..ec7076994 100644
--- a/src/h5/dd-resizable.ts
+++ b/src/h5/dd-resizable.ts
@@ -1,5 +1,5 @@
 /**
- * dd-resizable.ts 4.2.4-dev
+ * dd-resizable.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/h5/dd-utils.ts b/src/h5/dd-utils.ts
index 2333be24f..cee1cee3b 100644
--- a/src/h5/dd-utils.ts
+++ b/src/h5/dd-utils.ts
@@ -1,5 +1,5 @@
 /**
- * dd-utils.ts 4.2.4-dev
+ * dd-utils.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 export class DDUtils {
diff --git a/src/h5/gridstack-dd-native.ts b/src/h5/gridstack-dd-native.ts
index f0dd9e2ed..e901df528 100644
--- a/src/h5/gridstack-dd-native.ts
+++ b/src/h5/gridstack-dd-native.ts
@@ -1,5 +1,5 @@
 /**
- * gridstack-dd-native.ts 4.2.4-dev
+ * gridstack-dd-native.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/jq/gridstack-dd-jqueryui.ts b/src/jq/gridstack-dd-jqueryui.ts
index e7f1df7b3..e7e9b0a0b 100644
--- a/src/jq/gridstack-dd-jqueryui.ts
+++ b/src/jq/gridstack-dd-jqueryui.ts
@@ -1,4 +1,4 @@
-// gridstack-dd-jqueryui.ts 4.2.4-dev
+// gridstack-dd-jqueryui.ts 4.2.5
 // Copyright (c) 2021 Alain Dumesny - see root license
 import { GridStackElement } from '../gridstack';
 import { GridStackDD, DDOpts, DDKey, DDDropOpt, DDCallback, DDValue } from '../gridstack-dd';
diff --git a/src/types.ts b/src/types.ts
index 3fcdc6171..097709bc1 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,5 +1,5 @@
 /**
- * types.ts 4.2.4-dev
+ * types.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/utils.ts b/src/utils.ts
index f8fbc667c..612db33dc 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,5 +1,5 @@
 /**
- * utils.ts 4.2.4-dev
+ * utils.ts 4.2.5
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
