Merge pull request #1234 from adumesny/develop

`staticGrid` no longer disable oneColumnMode

Author: Alain Dumesny

doc/CHANGES.md

@@ -35,7 +35,7 @@ Change log
 
 ## 1.1.1-dev (upcoming)
 
-- TBD
+- fix [1229](https://github.com/gridstack/gridstack.js/issues/1229) `staticGrid` no longer disable oneColumnMode
 
 ## 1.1.1 (2020-03-17)
 

doc/README.md

@@ -101,7 +101,7 @@ gridstack.js API
 - `removeTimeout` - time in milliseconds before widget is being removed while dragging outside of the grid. (default: `2000`)
 - `row` - fix grid number of rows. This is a shortcut of writing `minRow:N, maxRow:N`. (default `0` no constrain)
 - `rtl` - if `true` turns grid to RTL. Possible values are `true`, `false`, `'auto'` (default: `'auto'`) See [example](http://gridstackjs.com/demo/rtl.html)
-- `staticGrid` - makes grid static (default `false`). If true widgets are not movable/resizable. You don't even need jQueryUI draggable/resizable.  A CSS class `grid-stack-static` is also added to the container.
+- `staticGrid` - removes drag&drop&resize (default `false`). If `true` widgets are not movable/resizable by the user, but code can still move and oneColumnMode will still work. You don't even need jQueryUI draggable/resizable.  A CSS class `grid-stack-static` is also added to the container.
 - `verticalMargin` - vertical gap size (default: `20`). Can be:
   * an integer (px)
   * a string (ex: '2em', '20px', '2rem')

spec/gridstack-spec.js

@@ -145,6 +145,7 @@ describe('gridstack', function() {
         staticGrid: true
       };
       var grid = GridStack.init(options);
+      expect($('.grid-stack').hasClass('grid-stack-static')).toBe(true);
       $('.grid-stack').removeClass('grid-stack-static');
       grid._setStaticClass();
       expect($('.grid-stack').hasClass('grid-stack-static')).toBe(true);
@@ -156,6 +157,7 @@ describe('gridstack', function() {
         staticGrid: false
       };
       var grid = GridStack.init(options);
+      expect($('.grid-stack').hasClass('grid-stack-static')).toBe(false);
       $('.grid-stack').addClass('grid-stack-static');
       grid._setStaticClass();
       expect($('.grid-stack').hasClass('grid-stack-static')).toBe(false);

src/gridstack.d.ts

@@ -624,9 +624,10 @@ interface GridstackOptions {
   rtl ? : boolean | 'auto';
 
   /**
-   * makes grid static (default?: false). If `true` widgets are not movable/resizable.
-   * You don't even need draggable/resizable. A CSS class
-   * 'grid-stack-static' is also added to the element.
+   * removes drag&drop&resize (default `false`).
+   * If `true` widgets are not movable/resizable by the user, but code can still move and oneColumnMode will still work.
+   * You don't even need jQueryUI draggable/resizable.
+   * A CSS class `grid-stack-static` is also added to the container.
    */
   staticGrid ? : boolean;
 

src/gridstack.js

@@ -867,14 +867,12 @@
         self._updateHeightsOnResize();
       }
 
-      if (self.opts.staticGrid) { return; }
-
       if (!self.opts.disableOneColumnMode && (window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth) <= self.opts.minWidth) {
-        if (self.oneColumnMode) {  return; }
+        if (self.oneColumnMode) { return }
         self.oneColumnMode = true;
         self.column(1);
       } else {
-        if (!self.oneColumnMode) { return; }
+        if (!self.oneColumnMode) { return }
         self.oneColumnMode = false;
         self.column(self._prevColumn);
       }