deblan/gridstack.js
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #431 from rharriso/master

Browse source 
Remove requirement for jQueryUI when grid is static
This commit is contained in:
Pavel Reznikov 2016-04-21 15:12:37 -07:00
parent 61ed99ab5c 4399e1a455
commit 35b9c6a6c2
5 changed files with 59 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
dist/gridstack.js vendored
View file

@ -676,7 +676,7 @@
$(window).resize(this.onResizeHandler);
this.onResizeHandler();
if (typeof self.opts.removable === 'string') {
if (!self.opts.staticGrid && typeof self.opts.removable === 'string') {
var trashZone = $(self.opts.removable);
if (!trashZone.data('droppable')) {
trashZone.droppable({
@ -684,25 +684,25 @@
});
}
trashZone
.on('dropover', function(event, ui) {
var el = $(ui.draggable);
var node = el.data('_gridstack_node');
if (node._grid !== self) {
return;
}
self._setupRemovingTimeout(el);
})
.on('dropout', function(event, ui) {
var el = $(ui.draggable);
var node = el.data('_gridstack_node');
if (node._grid !== self) {
return;
}
self._clearRemovingTimeout(el);
});
.on('dropover', function(event, ui) {
var el = $(ui.draggable);
var node = el.data('_gridstack_node');
if (node._grid !== self) {
return;
}
self._setupRemovingTimeout(el);
})
.on('dropout', function(event, ui) {
var el = $(ui.draggable);
var node = el.data('_gridstack_node');
if (node._grid !== self) {
return;
}
self._clearRemovingTimeout(el);
});
}
if (self.opts.acceptWidgets) {
if (!self.opts.staticGrid && self.opts.acceptWidgets) {
var draggingElement = null;
var onDrag = function(event, ui) {
@ -801,7 +801,7 @@
.removeClass('ui-draggable ui-draggable-dragging ui-draggable-disabled')
.unbind('drag', onDrag);
self.container.append(el);
self._prepareElementByNode(el, node);
self._prepareElementsByNode(el, node);
self._updateContainerHeight();
self._triggerChangeEvent();
@ -969,7 +969,7 @@
node._isAboutToRemove = false;
};
GridStack.prototype._prepareElementByNode = function(el, node) {
GridStack.prototype._prepareElementsByNode = function(el, node) {
var self = this;
var cellWidth;
@ -1119,11 +1119,11 @@
resize: dragOrResize
}));
if (node.noMove || this._isOneColumnMode() || this.opts.staticGrid || this.opts.disableDrag) {
if (node.noMove || this._isOneColumnMode() || this.opts.disableDrag) {
el.draggable('disable');
}
if (node.noResize || this._isOneColumnMode() || this.opts.staticGrid || this.opts.disableResize) {
if (node.noResize || this._isOneColumnMode() || this.opts.disableResize) {
el.resizable('disable');
}
@ -1155,7 +1155,9 @@
}, triggerAddEvent);
el.data('_gridstack_node', node);
this._prepareElementByNode(el, node);
if (!this.opts.staticGrid) {
this._prepareElementsByNode(el, node);
}
};
GridStack.prototype.setAnimation = function(enable) {
@ -1251,7 +1253,7 @@
el.each(function(index, el) {
el = $(el);
var node = el.data('_gridstack_node');
if (typeof node == 'undefined' || node === null) {
if (self.opts.staticGrid || typeof node == 'undefined' || node === null) {
return;
}
@ -1271,7 +1273,7 @@
el.each(function(index, el) {
el = $(el);
var node = el.data('_gridstack_node');
if (typeof node == 'undefined' || node === null) {
if (self.opts.staticGrid || typeof node == 'undefined' || node === null) {
return;
}

6
dist/gridstack.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/gridstack.min.map vendored
View file

File diff suppressed because one or more lines are too long

1
package.json
View file

@ -32,6 +32,7 @@
"devDependencies": {
"connect": "^3.4.1",
"coveralls": "^2.11.8",
"doctoc": "^1.0.0",
"grunt": "^0.4.5",
"grunt-contrib-connect": "^0.11.2",
"grunt-contrib-copy": "^0.8.2",

52
src/gridstack.js
View file

@ -676,7 +676,7 @@
$(window).resize(this.onResizeHandler);
this.onResizeHandler();
if (typeof self.opts.removable === 'string') {
if (!self.opts.staticGrid && typeof self.opts.removable === 'string') {
var trashZone = $(self.opts.removable);
if (!trashZone.data('droppable')) {
trashZone.droppable({
@ -684,25 +684,25 @@
});
}
trashZone
.on('dropover', function(event, ui) {
var el = $(ui.draggable);
var node = el.data('_gridstack_node');
if (node._grid !== self) {
return;
}
self._setupRemovingTimeout(el);
})
.on('dropout', function(event, ui) {
var el = $(ui.draggable);
var node = el.data('_gridstack_node');
if (node._grid !== self) {
return;
}
self._clearRemovingTimeout(el);
});
.on('dropover', function(event, ui) {
var el = $(ui.draggable);
var node = el.data('_gridstack_node');
if (node._grid !== self) {
return;
}
self._setupRemovingTimeout(el);
})
.on('dropout', function(event, ui) {
var el = $(ui.draggable);
var node = el.data('_gridstack_node');
if (node._grid !== self) {
return;
}
self._clearRemovingTimeout(el);
});
}
if (self.opts.acceptWidgets) {
if (!self.opts.staticGrid && self.opts.acceptWidgets) {
var draggingElement = null;
var onDrag = function(event, ui) {
@ -801,7 +801,7 @@
.removeClass('ui-draggable ui-draggable-dragging ui-draggable-disabled')
.unbind('drag', onDrag);
self.container.append(el);
self._prepareElementByNode(el, node);
self._prepareElementsByNode(el, node);
self._updateContainerHeight();
self._triggerChangeEvent();
@ -969,7 +969,7 @@
node._isAboutToRemove = false;
};
GridStack.prototype._prepareElementByNode = function(el, node) {
GridStack.prototype._prepareElementsByNode = function(el, node) {
var self = this;
var cellWidth;
@ -1119,11 +1119,11 @@
resize: dragOrResize
}));
if (node.noMove || this._isOneColumnMode() || this.opts.staticGrid || this.opts.disableDrag) {
if (node.noMove || this._isOneColumnMode() || this.opts.disableDrag) {
el.draggable('disable');
}
if (node.noResize || this._isOneColumnMode() || this.opts.staticGrid || this.opts.disableResize) {
if (node.noResize || this._isOneColumnMode() || this.opts.disableResize) {
el.resizable('disable');
}
@ -1155,7 +1155,9 @@
}, triggerAddEvent);
el.data('_gridstack_node', node);
this._prepareElementByNode(el, node);
if (!this.opts.staticGrid) {
this._prepareElementsByNode(el, node);
}
};
GridStack.prototype.setAnimation = function(enable) {
@ -1251,7 +1253,7 @@
el.each(function(index, el) {
el = $(el);
var node = el.data('_gridstack_node');
if (typeof node == 'undefined' || node === null) {
if (self.opts.staticGrid || typeof node == 'undefined' || node === null) {
return;
}
@ -1271,7 +1273,7 @@
el.each(function(index, el) {
el = $(el);
var node = el.data('_gridstack_node');
if (typeof node == 'undefined' || node === null) {
if (self.opts.staticGrid || typeof node == 'undefined' || node === null) {
return;
}