Merge pull request #2024 from adumesny/master

adumesny · web-flow · commit 47b3992874d6 · 2022-08-27T15:40:01.000-07:00
rev 6.0.0-dev
diff --git a/README.md b/README.md
@@ -187,14 +187,15 @@ GridStack makes it very easy if you need [1-12] columns out of the box (default
 GridStack.init( {column: N} );
 ```
 
-2) include `gridstack-extra.css` if **N < 12** (else custom CSS - see next). Without these, things will not render/work correctly.
+2) also include `gridstack-extra.css` if **N < 12** (else custom CSS - see next). Without these, things will not render/work correctly.
 ```html
-<link href="node_modules/gridstack/dist/gridstack-extra.css" rel="stylesheet"/>
+<link href="node_modules/gridstack/dist/gridstack.min.css" rel="stylesheet"/>
+<link href="node_modules/gridstack/dist/gridstack-extra.min.css" rel="stylesheet"/>
 
 <div class="grid-stack">...</div>
 ```
 
-Note: class `.grid-stack-N` will automatically be added and we include `gridstack-extra.css` which defines CSS for grids with custom [2-11] columns. Anything more and you'll need to generate the SASS/CSS yourself (see next).
+Note: class `.grid-stack-N` will automatically be added and we include `gridstack-extra.min.css` which defines CSS for grids with custom [2-11] columns. Anything more and you'll need to generate the SASS/CSS yourself (see next).
 
 See example: [2 grids demo](http://gridstack.github.io/gridstack.js/demo/two.html) with 6 columns
 
diff --git a/demo/canvasJS.html b/demo/canvasJS.html
@@ -4,7 +4,7 @@
   <title>CanvasJS grid demo</title>
 
   <link rel="stylesheet" href="demo.css"/>
-  <script src="https://cdn.jsdelivr.net/npm/gridstack@6.0.0-beta/dist/gridstack-jq.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/gridstack@5.1.1/dist/gridstack-jq.js"></script>
   <script src="https://canvasjs.com/assets/script/canvasjs.min.js"></script>
 
   <style type="text/css">
diff --git a/demo/website.html b/demo/website.html
@@ -13,6 +13,7 @@
   <script src="../dist/es5/gridstack-poly.js"></script>
   <script src="../dist/es5/gridstack.js"></script>
   
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
   <script src="https://getbootstrap.com/docs/4.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-xrRywqdh3PHs8keKZN+8zzc5TX0GRTLCcmivcbNJWm2rs5C8PRhcEn3czEjhAO9o" crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.16.2/build/highlight.min.js"></script>
 
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -5,6 +5,7 @@ Change log
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
 
+- [6.0.0-dev (TBD)](#600-dev-tbd)
 - [6.0.0 (2022-08-21)](#600-2022-08-21)
 - [5.1.1 (2022-06-16)](#511-2022-06-16)
 - [5.1.0 (2022-05-21)](#510-2022-05-21)
@@ -68,6 +69,8 @@ Change log
 - [v0.1.0 (2014-11-18)](#v010-2014-11-18)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
+## 6.0.0-dev (TBD)
+* fixed `float(val)` to set on grid and engine, so save() will read it.
 
 ## 6.0.0 (2022-08-21)
 * converted previous HTML5 `draggable=true` based code to simple Mouse Events and Touch mobile support for drag&Drop.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "6.0.0",
+  "version": "6.0.0-dev",
   "description": "TypeScript/JS lib for dashboard layout and creation, no external dependencies, with many wrappers (React, Angular, Vue, Ember, knockout...)",
   "main": "./dist/gridstack.js",
   "types": "./dist/gridstack.d.ts",
diff --git a/spec/e2e/html/1142_change_event_missing.html b/spec/e2e/html/1142_change_event_missing.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>1142 demo</title>
   <link rel="stylesheet" href="../../../demo/demo.css"/>
-  <script src="https://cdn.jsdelivr.net/npm/gridstack@6.0.0-beta/dist/gridstack-jq.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/gridstack@5.1.1/dist/gridstack-jq.js"></script>
 </head>
 <body>
   <h1>JQ test case with click to remove</h1>
diff --git a/src/dd-base-impl.ts b/src/dd-base-impl.ts
@@ -1,5 +1,5 @@
 /**
- * dd-base-impl.ts 6.0.0
+ * dd-base-impl.ts 6.0.0-dev
  * Copyright (c) 2021-2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-draggable.ts b/src/dd-draggable.ts
@@ -1,5 +1,5 @@
 /**
- * dd-draggable.ts 6.0.0
+ * dd-draggable.ts 6.0.0-dev
  * Copyright (c) 2021-2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-droppable.ts b/src/dd-droppable.ts
@@ -1,5 +1,5 @@
 /**
- * dd-droppable.ts 6.0.0
+ * dd-droppable.ts 6.0.0-dev
  * Copyright (c) 2021-2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-element.ts b/src/dd-element.ts
@@ -1,5 +1,5 @@
 /**
- * dd-elements.ts 6.0.0
+ * dd-elements.ts 6.0.0-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-gridstack.ts b/src/dd-gridstack.ts
@@ -1,5 +1,5 @@
 /**
- * dd-gridstack.ts 6.0.0
+ * dd-gridstack.ts 6.0.0-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-manager.ts b/src/dd-manager.ts
@@ -1,5 +1,5 @@
 /**
- * dd-manager.ts 6.0.0
+ * dd-manager.ts 6.0.0-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-resizable-handle.ts b/src/dd-resizable-handle.ts
@@ -1,5 +1,5 @@
 /**
- * dd-resizable-handle.ts 6.0.0
+ * dd-resizable-handle.ts 6.0.0-dev
  * Copyright (c) 2021-2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-resizable.ts b/src/dd-resizable.ts
@@ -1,5 +1,5 @@
 /**
- * dd-resizable.ts 6.0.0
+ * dd-resizable.ts 6.0.0-dev
  * Copyright (c) 2021-2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/dd-touch.ts b/src/dd-touch.ts
@@ -1,5 +1,5 @@
 /**
- * touch.ts 6.0.0
+ * touch.ts 6.0.0-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack-engine.ts b/src/gridstack-engine.ts
@@ -1,5 +1,5 @@
 /**
- * gridstack-engine.ts 6.0.0
+ * gridstack-engine.ts 6.0.0-dev
  * Copyright (c) 2021-2022 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack-poly.js b/src/gridstack-poly.js
@@ -1,5 +1,5 @@
 /**
- * gridstack-poly.ts 6.0.0 used for IE and older browser support (not supported in v2-v4.3.1, but again in v4.4)
+ * gridstack-poly.ts 6.0.0-dev used for IE and older browser support (not supported in v2-v4.3.1, but again in v4.4)
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack.scss b/src/gridstack.scss
@@ -1,5 +1,5 @@
 /**
- * gridstack SASS styles 6.0.0
+ * gridstack SASS styles 6.0.0-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/gridstack.ts b/src/gridstack.ts
@@ -1,5 +1,5 @@
 /*!
- * GridStack 6.0.0
+ * GridStack 6.0.0-dev
  * https://gridstackjs.com/
  *
  * Copyright (c) 2021-2022 Alain Dumesny
@@ -1515,7 +1515,7 @@ export class GridStack {
     return this;
   }
 
-  static GDRev = '6.0.0';
+  static GDRev = '6.0.0-dev';
 
   /*
    * drag&drop empty stubs that will be implemented in dd-gridstack.ts for non static grid
diff --git a/src/types.ts b/src/types.ts
@@ -1,5 +1,5 @@
 /**
- * types.ts 6.0.0
+ * types.ts 6.0.0-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 
diff --git a/src/utils.ts b/src/utils.ts
@@ -1,5 +1,5 @@
 /**
- * utils.ts 6.0.0
+ * utils.ts 6.0.0-dev
  * Copyright (c) 2021 Alain Dumesny - see GridStack root license
  */
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gridstack",`
`3`		`- "version": "6.0.0",`
	`3`	`+ "version": "6.0.0-dev",`
`4`	`4`	`"description": "TypeScript/JS lib for dashboard layout and creation, no external dependencies, with many wrappers (React, Angular, Vue, Ember, knockout...)",`
`5`	`5`	`"main": "./dist/gridstack.js",`
`6`	`6`	`"types": "./dist/gridstack.d.ts",`