lloopp-dev
diff --git a/‎dist/gridstack.all.js
Lines changed: 3 additions & 3 deletions b/‎dist/gridstack.all.js
Lines changed: 3 additions & 3 deletions
diff --git a/‎dist/gridstack.jQueryUI.js
Lines changed: 1 addition & 7 deletions b/‎dist/gridstack.jQueryUI.js
Lines changed: 1 addition & 7 deletions
diff --git a/‎dist/gridstack.jQueryUI.min.js
Lines changed: 1 addition & 1 deletion b/‎dist/gridstack.jQueryUI.min.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎dist/gridstack.js
Lines changed: 8 additions & 4 deletions b/‎dist/gridstack.js
Lines changed: 8 additions & 4 deletions
diff --git a/‎dist/gridstack.min.js
Lines changed: 2 additions & 2 deletions b/‎dist/gridstack.min.js
Lines changed: 2 additions & 2 deletions
diff --git a/‎dist/gridstack.min.map
Lines changed: 1 addition & 1 deletion b/‎dist/gridstack.min.map
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/gridstack.js
Lines changed: 2 additions & 1 deletion b/‎src/gridstack.js
Lines changed: 2 additions & 1 deletion
@@ -77,13 +77,7 @@
 
     JQueryUIGridStackDragDropPlugin.prototype.droppable = function(el, opts) {
         el = $(el);
-        if (opts === 'disable' || opts === 'enable') {
-            el.droppable(opts);
-        } else {
-            el.droppable({
-                accept: opts.accept
-            });
-        }
+        el.droppable(opts);
         return this;
     };
 
 
@@ -623,6 +623,9 @@
             disableResize: opts.disableResize || false,
             rtl: 'auto',
             removable: false,
+            removableOptions: _.defaults(opts.removableOptions || {}, {
+                accept: '.' + opts.itemClass
+            }),
             removeTimeout: 2000,
             verticalMarginUnit: 'px',
             cellHeightUnit: 'px',
@@ -770,9 +773,7 @@
         if (!self.opts.staticGrid && typeof self.opts.removable === 'string') {
             var trashZone = $(self.opts.removable);
             if (!this.dd.isDroppable(trashZone)) {
-                this.dd.droppable(trashZone, {
-                    accept: '.' + self.opts.itemClass
-                });
+                this.dd.droppable(trashZone, self.opts.removableOptions);
             }
             this.dd
                 .on(trashZone, 'dropover', function(event, ui) {
@@ -781,6 +782,7 @@
                     if (node._grid !== self) {
                         return;
                     }
+                    el.data('inTrashZone', true);
                     self._setupRemovingTimeout(el);
                 })
                 .on(trashZone, 'dropout', function(event, ui) {
@@ -789,6 +791,7 @@
                     if (node._grid !== self) {
                         return;
                     }
+                    el.data('inTrashZone', false);
                     self._clearRemovingTimeout(el);
                 });
         }
@@ -1097,7 +1100,8 @@
             }
 
             if (event.type == 'drag') {
-                if (x < 0 || x >= self.grid.width || y < 0 || (!self.grid.float && y > self.grid.getGridHeight())) {
+                if (el.data('inTrashZone') || x < 0 || x >= self.grid.width || y < 0 ||
+                    (!self.grid.float && y > self.grid.getGridHeight())) {
                     if (!node._temporaryRemoved) {
                         if (self.opts.removable === true) {
                             self._setupRemovingTimeout(el);
 
@@ -1100,7 +1100,8 @@
             }
 
             if (event.type == 'drag') {
-                if (el.data('inTrashZone') || x < 0 || x >= self.grid.width || y < 0 || (!self.grid.float && y > self.grid.getGridHeight())) {
+                if (el.data('inTrashZone') || x < 0 || x >= self.grid.width || y < 0 ||
+                    (!self.grid.float && y > self.grid.getGridHeight())) {
                     if (!node._temporaryRemoved) {
                         if (self.opts.removable === true) {
                             self._setupRemovingTimeout(el);
Original file line number	Diff line number	Diff line change
`@@ -1100,7 +1100,8 @@`
`1100`	`1100`	`}`
`1101`	`1101`
`1102`	`1102`	`if (event.type == 'drag') {`
`1103`		`- if (el.data('inTrashZone') \|\| x < 0 \|\| x >= self.grid.width \|\| y < 0 \|\| (!self.grid.float && y > self.grid.getGridHeight())) {`
	`1103`	`+ if (el.data('inTrashZone') \|\| x < 0 \|\| x >= self.grid.width \|\| y < 0 \|\|`
	`1104`	`+ (!self.grid.float && y > self.grid.getGridHeight())) {`
`1104`	`1105`	`if (!node._temporaryRemoved) {`
`1105`	`1106`	`if (self.opts.removable === true) {`
`1106`	`1107`	`self._setupRemovingTimeout(el);`