Merge pull request #1586 from adumesny/develop

adumesny · web-flow · commit 5ee5e60df27b · 2021-01-24T09:33:54.000-08:00
@adumesny https://jqueryui.com/download/ version
diff --git a/demo/two-jq.html b/demo/two-jq.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Two grids demo</title>
+  <title>Two grids JQ demo</title>
 
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
   <link rel="stylesheet" href="demo.css"/>
@@ -45,21 +45,19 @@
 </head>
 <body>
   <div class="container-fluid">
-    <h1>Two grids demo</h1>
+    <h1>Two grids demo (Jquery version)</h1>
 
     <div class="row">
       <div class="col-md-3">
         <div class="sidebar">
-          
           <!-- will size to match content -->
           <div class="grid-stack-item">
             <div class="grid-stack-item-content">Drag me</div>
           </div>
           <!-- manually force a drop size of 2x1 -->
-          <div class="grid-stack-item" gs-w="2" gs-h="1">
-            <div class="grid-stack-item-content">Drag me 2x1</div>
+          <div class="grid-stack-item" gs-w="2" gs-h="1" gs-max-w="3">
+            <div class="grid-stack-item-content">2x1, max=3</div>
           </div>
-
         </div>
       </div>
       <div class="col-md-9">
@@ -83,19 +81,21 @@ <h1>Two grids demo</h1>
   </div>
   <script src="events.js"></script>
   <script type="text/javascript">
+  let grids;
+  $(function () { // testing $ works (delay loading here)
     let options = {
       column: 6,
       minRow: 1, // don't collapse when empty
       cellHeight: 70,
       disableOneColumnMode: true,
       float: false,
-      dragIn: '.sidebar .grid-stack-item', // class that can be dragged from outside
+      dragIn: '.sidebar .grid-stack-item', // add draggable to class
       dragInOptions: { revert: 'invalid', scroll: false, appendTo: 'body', helper: 'clone' }, // clone
       removable: '.trash', // drag-out delete class
       removeTimeout: 100,
       acceptWidgets: function(el) { return true; } // function example, else can be simple: true | false | '.someClass' value
     };
-    let grids = GridStack.initAll(options);
+    grids = GridStack.initAll(options);
     grids[1].float(true);
 
     let items = [
@@ -110,15 +110,15 @@ <h1>Two grids demo</h1>
       addEvents(grid, i);
       grid.load(items);
     });
+  });
+  function toggleFloat(button, i) {
+    grids[i].float(! grids[i].getFloat());
+    button.innerHTML = 'float: ' + grids[i].getFloat();
+  }
 
-    function toggleFloat(button, i) {
-      grids[i].float(! grids[i].getFloat());
-      button.innerHTML = 'float: ' + grids[i].getFloat();
-    }
-
-    function compact(i) {
-      grids[i].compact();
-    }
+  function compact(i) {
+    grids[i].compact();
+  }
   </script>
 </body>
 </html>
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -5,7 +5,8 @@ Change log
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
 
-- [3.1.5](#314-dev)
+- [3.1.5-dev](#315-dev)
+- [3.1.5 (2021-1-23)](#315-2021-1-23)
 - [3.1.4 (2021-1-11)](#314-2021-1-11)
 - [3.1.3 (2021-1-2)](#313-2021-1-2)
 - [3.1.2 (2020-12-7)](#312-2020-12-7)
@@ -45,6 +46,10 @@ Change log
 - [v0.1.0 (2014-11-18)](#v010-2014-11-18)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
+## 3.1.5-dev
+
+- TBD
+
 ## 3.1.5 (2021-1-23)
 
 - fix [1572](https://github.com/gridstack/gridstack.js/issues/1572) `column: N` option now sets CSS class
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "3.1.5",
+  "version": "3.1.5-dev",
   "description": "TypeScript/Javascript lib for dashboard layout and creation, no external dependencies, with many wrappers (React, Angular, Ember, knockout...)",
   "main": "./dist/gridstack.js",
   "types": "./dist/gridstack.d.ts",
diff --git a/src/gridstack-dd.ts b/src/gridstack-dd.ts
@@ -1,4 +1,4 @@
-// gridstack-GridStackDD.get().ts 3.1.5 @preserve
+// gridstack-GridStackDD.get().ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/gridstack-ddi.ts b/src/gridstack-ddi.ts
@@ -1,4 +1,4 @@
-// gridstack-ddi.ts 3.1.5 @preserve
+// gridstack-ddi.ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/gridstack-engine.ts b/src/gridstack-engine.ts
@@ -1,4 +1,4 @@
-// gridstack-engine.ts 3.1.5 @preserve
+// gridstack-engine.ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/gridstack-extra.scss b/src/gridstack-extra.scss
@@ -1,5 +1,5 @@
 /*!
- * gridstack 3.1.5 extra CSS for [2-11] columns (non default)
+ * gridstack 3.1.5-dev extra CSS for [2-11] columns (non default)
  * https://gridstackjs.com/
  * (c) 2014-2020  Alain Dumesny, Dylan Weiss, Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.
diff --git a/src/gridstack.scss b/src/gridstack.scss
@@ -1,5 +1,5 @@
 /*!
- * gridstack 3.1.5 required CSS for default 12 and 1 column Mode size. Use gridstack-extra.css for column [2-11], else see https://github.com/gridstack/gridstack.js#custom-columns-css
+ * gridstack 3.1.5-dev required CSS for default 12 and 1 column Mode size. Use gridstack-extra.css for column [2-11], else see https://github.com/gridstack/gridstack.js#custom-columns-css
  * https://gridstackjs.com/
  * (c) 2014-2020 Alain Dumesny, Dylan Weiss, Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.
diff --git a/src/gridstack.ts b/src/gridstack.ts
@@ -1,4 +1,4 @@
-// gridstack.ts 3.1.5 @preserve
+// gridstack.ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/h5/dd-base-impl.ts b/src/h5/dd-base-impl.ts
@@ -1,4 +1,4 @@
-// dd-base-impl.ts 3.1.5 @preserve
+// dd-base-impl.ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/h5/dd-draggable.ts b/src/h5/dd-draggable.ts
@@ -1,4 +1,4 @@
-// dd-draggable.ts 3.1.5 @preserve
+// dd-draggable.ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/h5/dd-droppable.ts b/src/h5/dd-droppable.ts
@@ -1,4 +1,4 @@
-// dd-droppable.ts 3.1.5 @preserve
+// dd-droppable.ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/h5/dd-element.ts b/src/h5/dd-element.ts
@@ -1,4 +1,4 @@
-// dd-elements.ts 3.1.5 @preserve
+// dd-elements.ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/h5/dd-manager.ts b/src/h5/dd-manager.ts
@@ -1,4 +1,4 @@
-// dd-manager.ts 3.1.5 @preserve
+// dd-manager.ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/h5/dd-resizable-handle.ts b/src/h5/dd-resizable-handle.ts
@@ -1,4 +1,4 @@
-// dd-resizable-handle.ts 3.1.5 @preserve
+// dd-resizable-handle.ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/h5/dd-resizable.ts b/src/h5/dd-resizable.ts
@@ -1,4 +1,4 @@
-// dd-resizable.ts 3.1.5 @preserve
+// dd-resizable.ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/h5/dd-utils.ts b/src/h5/dd-utils.ts
@@ -1,4 +1,4 @@
-// dd-utils.ts 3.1.5 @preserve
+// dd-utils.ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/h5/gridstack-dd-native.ts b/src/h5/gridstack-dd-native.ts
@@ -1,4 +1,4 @@
-// gridstack-dd-native.ts 3.1.5 @preserve
+// gridstack-dd-native.ts 3.1.5-dev @preserve
 
 /**
  * https://gridstackjs.com/
diff --git a/src/index-h5.ts b/src/index-h5.ts
@@ -1,4 +1,4 @@
-// index.html5.ts 3.1.5 - everything you need for a Grid that uses HTML5 native drag&drop (work in progress) @preserve
+// index.html5.ts 3.1.5-dev - everything you need for a Grid that uses HTML5 native drag&drop (work in progress) @preserve
 
 // import './gridstack-poly.js';
 
diff --git a/src/index-jq.ts b/src/index-jq.ts
@@ -1,4 +1,4 @@
-// index.jq.ts 3.1.5 - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature) @preserve
+// index.jq.ts 3.1.5-dev - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature) @preserve
 
 // import './gridstack-poly.js';
 
diff --git a/src/index-static.ts b/src/index-static.ts
@@ -1,4 +1,4 @@
-// index.static.ts 3.1.5 - everything you need for a static Grid (non draggable) @preserve
+// index.static.ts 3.1.5-dev - everything you need for a static Grid (non draggable) @preserve
 
 // import './gridstack-poly.js';
 
diff --git a/src/jq/jquery-ui.js b/src/jq/jquery-ui.js
diff --git a/src/types.ts b/src/types.ts
diff --git a/src/utils.ts b/src/utils.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gridstack",`
`3`		`- "version": "3.1.5",`
	`3`	`+ "version": "3.1.5-dev",`
`4`	`4`	`"description": "TypeScript/Javascript lib for dashboard layout and creation, no external dependencies, with many wrappers (React, Angular, Ember, knockout...)",`
`5`	`5`	`"main": "./dist/gridstack.js",`
`6`	`6`	`"types": "./dist/gridstack.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// gridstack-GridStackDD.get().ts 3.1.5 @preserve`
	`1`	`+// gridstack-GridStackDD.get().ts 3.1.5-dev @preserve`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* https://gridstackjs.com/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// gridstack-ddi.ts 3.1.5 @preserve`
	`1`	`+// gridstack-ddi.ts 3.1.5-dev @preserve`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* https://gridstackjs.com/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// gridstack-engine.ts 3.1.5 @preserve`
	`1`	`+// gridstack-engine.ts 3.1.5-dev @preserve`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* https://gridstackjs.com/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// gridstack.ts 3.1.5 @preserve`
	`1`	`+// gridstack.ts 3.1.5-dev @preserve`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* https://gridstackjs.com/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// dd-base-impl.ts 3.1.5 @preserve`
	`1`	`+// dd-base-impl.ts 3.1.5-dev @preserve`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* https://gridstackjs.com/`