Merge commit 'f96dae55f32612344896a3b52318fa451bd69b83'

This commit is contained in:
d 2016-02-24 13:29:13 -05:00
commit 4af1f27447
4 changed files with 15 additions and 9 deletions

9
dist/gridstack.js vendored
View file

@ -335,12 +335,15 @@
return node;
};
GridStackEngine.prototype.removeNode = function(node) {
GridStackEngine.prototype.removeNode = function(node, detachNode) {
detachNode = typeof detachNode === 'undefined' ? true : detachNode;
this._removedNodes.push(_.clone(node));
node._id = null;
this.nodes = _.without(this.nodes, node);
this._packNodes();
this._notify(node);
if (detachNode) {
this._notify(node);
}
};
GridStackEngine.prototype.canMoveNode = function(node, x, y, width, height) {
@ -1083,7 +1086,7 @@
node = this.grid.getNodeDataByDOMEl(el);
}
this.grid.removeNode(node);
this.grid.removeNode(node, detachNode);
el.removeData('_gridstack_node');
this._updateContainerHeight();
if (detachNode) {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -335,12 +335,15 @@
return node;
};
GridStackEngine.prototype.removeNode = function(node) {
GridStackEngine.prototype.removeNode = function(node, detachNode) {
detachNode = typeof detachNode === 'undefined' ? true : detachNode;
this._removedNodes.push(_.clone(node));
node._id = null;
this.nodes = _.without(this.nodes, node);
this._packNodes();
this._notify(node);
if (detachNode) {
this._notify(node);
}
};
GridStackEngine.prototype.canMoveNode = function(node, x, y, width, height) {
@ -1083,7 +1086,7 @@
node = this.grid.getNodeDataByDOMEl(el);
}
this.grid.removeNode(node);
this.grid.removeNode(node, detachNode);
el.removeData('_gridstack_node');
this._updateContainerHeight();
if (detachNode) {