Merge pull request gridstack#1787 from adumesny/master

adumesny · web-flow · commit 07081b8c476a · 2021-06-13T07:33:25.000-07:00
fix removeable:true by itself now works
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-dev (TBD)](#425-dev-tbd)
 - [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)
@@ -58,6 +59,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-dev (TBD)
+
+* fix [#1784](https://github.com/gridstack/gridstack.js/issues/1784) `removable:true` working by itself (without needing `acceptWidgets:true`)
+
 ## 4.2.5 (2021-5-31)
 
 * fix for website with JQ `droppable('destroy')` giving error
diff --git a/src/gridstack-dd.ts b/src/gridstack-dd.ts
@@ -76,7 +76,7 @@ export abstract class GridStackDD extends GridStackDDI {
 GridStack.prototype._setupAcceptWidget = function(this: GridStack): GridStack {
 
   // check if we need to disable things
-  if (this.opts.staticGrid || !this.opts.acceptWidgets) {
+  if (this.opts.staticGrid || (!this.opts.acceptWidgets && !this.opts.removable)) {
     GridStackDD.get().droppable(this.el, 'destroy');
     return this;
   }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ export abstract class GridStackDD extends GridStackDDI {`
`76`	`76`	`GridStack.prototype._setupAcceptWidget = function(this: GridStack): GridStack {`
`77`	`77`
`78`	`78`	`// check if we need to disable things`
`79`		`- if (this.opts.staticGrid \|\| !this.opts.acceptWidgets) {`
	`79`	`+ if (this.opts.staticGrid \|\| (!this.opts.acceptWidgets && !this.opts.removable)) {`
`80`	`80`	`GridStackDD.get().droppable(this.el, 'destroy');`
`81`	`81`	`return this;`
`82`	`82`	`}`