Merge pull request #1318 from adumesny/develop

v1.2.0

Author: adumesny

README.md

@@ -71,7 +71,13 @@ npm install --save gridstack
 
 ## Include
 
-* after you install:
+after you install:
+
+```js
+import 'gridstack/dist/gridstack.all.js';
+import 'gridstack/dist/gridstack.css';
+```
+* alternatively in html
 
 ```html
 <link rel="stylesheet" href="node_modules/gridstack/dist/gridstack.min.css" />
@@ -81,8 +87,8 @@ npm install --save gridstack
 * or using CDN (minimized):
 
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@1.1.2/dist/gridstack.min.css" />
-<script src="https://cdn.jsdelivr.net/npm/gridstack@1.1.2/dist/gridstack.all.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@1.2.0/dist/gridstack.min.css" />
+<script src="https://cdn.jsdelivr.net/npm/gridstack@1.2.0/dist/gridstack.all.js"></script>
 ```
 
 if you need to debug, look at the git demo/ examples for non min includes.
@@ -175,7 +181,7 @@ 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.
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@1.1.2/dist/gridstack-extra.css"/>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@1.2.0/dist/gridstack-extra.css"/>
 
 <div class="grid-stack grid-stack-N">...</div>
 ```
@@ -337,7 +343,7 @@ Recommend looking at the [many samples](./demo) for more code examples.
 
 ### jQuery Application
 
-We're working on implementing HTML5 drag'n'drop through the plugin system. Right now it is still jquery-ui based. Because of that we are still bundling `jquery` (3.5.1) + `jquery-ui` (1.12.1 minimal drag|drop|resize) internally in `gridstack.all.js`. IFF your app needs to bring it's own version instead, you should **instead** include `gridstack-poly.min.js` (optional IE support) + `gridstack.min.js` + `gridstack.jQueryUI.min.js` after you import your libs.
+We're working on implementing HTML5 drag'n'drop through the plugin system. Right now it is still jquery-ui based. Because of that we are still bundling `jquery` (3.5.1) + `jquery-ui` (1.12.1 minimal drag|drop|resize) internally in `gridstack.all.js`. IFF your app needs to bring your own version instead, you should **instead** include `gridstack-poly.min.js` (optional IE support) + `gridstack.min.js` + `gridstack.jQueryUI.min.js` after you import your JQ libs. But note that there are issue with jQuery and ES6 import (see [1306](https://github.com/gridstack/gridstack.js/issues/1306))
 
 Changes
 =====

doc/CHANGES.md

@@ -5,7 +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/)*
 
-- [1.1.2-dev (upcoming)](#112-dev-upcoming)
+- [1.2.0 (2020-08-01)](#120-2020-08-01)
 - [1.1.2 (2020-05-17)](#112-2020-05-17)
 - [1.1.1 (2020-03-17)](#111-2020-03-17)
 - [1.1.0 (2020-02-29)](#110-2020-02-29)
@@ -34,7 +34,7 @@ Change log
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-## 1.1.2-dev (upcoming)
+## 1.2.0 (2020-08-01)
 
 - fix [1311](https://github.com/gridstack/gridstack.js/issues/1311) domAttr is not defined
 - adds `styleInHead` option to allow for selecting older behavior (adding STYLE element to HEAD element instead of parentNode)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "1.1.2-dev",
+  "version": "1.2.0",
   "description": "JavaScript / TypeScript for dashboard layout and creation, no external dependencies, with many wrappers (React, Angular, Ember, knockout...)",
   "main": "dist/gridstack",
   "repository": {

src/gridstack-extra.scss

@@ -1,5 +1,5 @@
 /*!
- * gridstack 1.1.2-dev extra CSS for [2-11] columns (non default)
+ * gridstack 1.2.0 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.

src/gridstack-poly.js

@@ -1,4 +1,4 @@
-/** gridstack.js 1.1.2-dev - IE and older browsers Polyfills for this library @preserve*/
+/** gridstack.js 1.2.0 - IE and older browsers Polyfills for this library @preserve*/
 /**
  * https://gridstackjs.com/
  * (c) 2019-2020 Alain Dumesny

src/gridstack.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for Gridstack 1.1.2-dev
+// Type definitions for Gridstack 1.2.0
 // Project: https://gridstackjs.com/
 // Definitions by: Pascal Senn <https://github.com/PascalSenn>
 //                 Ricky Blankenaufulland <https://github.com/ZoolWay>

src/gridstack.jQueryUI.js

@@ -1,4 +1,4 @@
-/** gridstack.js 1.1.2-dev - JQuery UI Drag&Drop plugin @preserve */
+/** gridstack.js 1.2.0 - JQuery UI Drag&Drop plugin @preserve */
 /**
  * https://gridstackjs.com/
  * (c) 2014-2020 Alain Dumesny, Dylan Weiss, Pavel Reznikov

src/gridstack.js

@@ -1,5 +1,5 @@
 /**
- * gridstack.js 1.1.2-dev
+ * gridstack.js 1.2.0
  * https://gridstackjs.com/
  * (c) 2014-2020 Alain Dumesny, Dylan Weiss, Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.

src/gridstack.scss

@@ -1,5 +1,5 @@
 /*!
- * required gridstack 1.1.2-dev CSS for default 12 and 1 columnMode size. Use gridstack-extra.css for others
+ * required gridstack 1.2.0 CSS for default 12 and 1 columnMode size. Use gridstack-extra.css for others
  * https://gridstackjs.com/
  * (c) 2014-2020 Alain Dumesny, Dylan Weiss, Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.