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

radiolips · web-flow · commit 34ddf0ad7a83 · 2017-09-06T11:34:30.000-04:00
Bugfix/743 real
diff --git a/src/gridstack.js b/src/gridstack.js
@@ -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');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1218,11 +1218,11 @@`
`1218`	`1218`	`resize: dragOrResize`
`1219`	`1219`	`});`
`1220`	`1220`
`1221`		`- if (node.noMove \|\| (this._isOneColumnMode() && !self.opts.disableOneColumnMode) \|\| this.opts.disableDrag) {`
	`1221`	`+ if (node.noMove \|\| (this._isOneColumnMode() && !self.opts.disableOneColumnMode) \|\| this.opts.disableDrag \|\| this.opts.staticGrid) {`
`1222`	`1222`	`this.dd.draggable(el, 'disable');`
`1223`	`1223`	`}`
`1224`	`1224`
`1225`		`- if (node.noResize \|\| (this._isOneColumnMode() && !self.opts.disableOneColumnMode) \|\| this.opts.disableResize) {`
	`1225`	`+ if (node.noResize \|\| (this._isOneColumnMode() && !self.opts.disableOneColumnMode) \|\| this.opts.disableResize \|\| this.opts.staticGrid) {`
`1226`	`1226`	`this.dd.resizable(el, 'disable');`
`1227`	`1227`	`}`
`1228`	`1228`