diff --git a/README.md b/README.md index 25668f2b3..8228a3da7 100644 --- a/README.md +++ b/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 @@ -81,8 +87,8 @@ npm install --save gridstack * or using CDN (minimized): ```html - - + + ``` 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 - +
...
``` @@ -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 ===== diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 0d1cf6587..24911426b 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -5,7 +5,7 @@ Change log **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 -## 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) diff --git a/package.json b/package.json index 1dd533538..7de4b3425 100644 --- a/package.json +++ b/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": { diff --git a/src/gridstack-extra.scss b/src/gridstack-extra.scss index bccbaf0a8..9d4a94fc4 100644 --- a/src/gridstack-extra.scss +++ b/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. diff --git a/src/gridstack-poly.js b/src/gridstack-poly.js index 1cade56e0..b87da5695 100644 --- a/src/gridstack-poly.js +++ b/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 diff --git a/src/gridstack.d.ts b/src/gridstack.d.ts index 1ae8c2041..654485655 100644 --- a/src/gridstack.d.ts +++ b/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 // Ricky Blankenaufulland diff --git a/src/gridstack.jQueryUI.js b/src/gridstack.jQueryUI.js index 297ac3ed4..1c37469cb 100644 --- a/src/gridstack.jQueryUI.js +++ b/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 diff --git a/src/gridstack.js b/src/gridstack.js index 5ca9f050a..cf2b04624 100644 --- a/src/gridstack.js +++ b/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. diff --git a/src/gridstack.scss b/src/gridstack.scss index a293f42fe..ac2a8b667 100644 --- a/src/gridstack.scss +++ b/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.