Skip to content

Commit 7d13123

Browse files
committed
Merge branch 'grotup-disableOneColumnMode' into develop
2 parents c1c4ff8 + 7a7aed5 commit 7d13123

File tree

7 files changed

+28
-25
lines changed

7 files changed

+28
-25
lines changed

dist/gridstack.all.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/gridstack.jQueryUI.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/gridstack.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,7 @@
606606
removeTimeout: 2000,
607607
verticalMarginUnit: 'px',
608608
cellHeightUnit: 'px',
609+
disableOneColumnMode: opts.disableOneColumnMode || false,
609610
oneColumnModeClass: opts.oneColumnModeClass || 'grid-stack-one-column-mode',
610611
ddPlugin: null
611612
});
@@ -699,7 +700,7 @@
699700
self._updateHeightsOnResize();
700701
}
701702

702-
if (self._isOneColumnMode()) {
703+
if (self._isOneColumnMode() && !self.opts.disableOneColumnMode) {
703704
if (oneColumnMode) {
704705
return;
705706
}
@@ -1204,11 +1205,11 @@
12041205
resize: dragOrResize
12051206
});
12061207

1207-
if (node.noMove || this._isOneColumnMode() || this.opts.disableDrag) {
1208+
if (node.noMove || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableDrag) {
12081209
this.dd.draggable(el, 'disable');
12091210
}
12101211

1211-
if (node.noResize || this._isOneColumnMode() || this.opts.disableResize) {
1212+
if (node.noResize || (this._isOneColumnMode() && !self.opts.disableOneColumnMode) || this.opts.disableResize) {
12121213
this.dd.resizable(el, 'disable');
12131214
}
12141215

@@ -1342,7 +1343,7 @@
13421343
}
13431344

13441345
node.noResize = !(val || false);
1345-
if (node.noResize || self._isOneColumnMode()) {
1346+
if (node.noResize || (self._isOneColumnMode() && !self.opts.disableOneColumnMode)) {
13461347
self.dd.resizable(el, 'disable');
13471348
} else {
13481349
self.dd.resizable(el, 'enable');
@@ -1362,7 +1363,7 @@
13621363
}
13631364

13641365
node.noMove = !(val || false);
1365-
if (node.noMove || self._isOneColumnMode()) {
1366+
if (node.noMove || (self._isOneColumnMode() && !self.opts.disableOneColumnMode)) {
13661367
self.dd.draggable(el, 'disable');
13671368
el.removeClass('ui-draggable-handle');
13681369
} else {

0 commit comments

Comments
 (0)