Commit 34ddf0ad authored by radiolips's avatar radiolips Committed by GitHub
Browse files

Merge pull request #759 from radiolips/bugfix/743-real

Bugfix/743 real
parents c0c1e47f aec1135b
......@@ -1218,11 +1218,11 @@
resize: dragOrResize
});
if (node.noMove || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableDrag) {
if (node.noMove || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableDrag || this.opts.staticGrid) {
this.dd.draggable(el, 'disable');
}
if (node.noResize || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableResize) {
if (node.noResize || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableResize || this.opts.staticGrid) {
this.dd.resizable(el, 'disable');
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment