Merge pull request #1179 from adumesny/develop

rev 1.1.0

Author: adumesny

README.md

@@ -77,8 +77,8 @@ npm install --save gridstack
 * Using CDN (minimized):
 
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@1.0.0/dist/gridstack.min.css" />
-<script src="https://cdn.jsdelivr.net/npm/gridstack@1.0.0/dist/gridstack.all.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@1.1.0/dist/gridstack.min.css" />
+<script src="https://cdn.jsdelivr.net/npm/gridstack@1.1.0/dist/gridstack.all.js"></script>
 ```
 
 if you need to debug, look at the git demo/ examples for non min includes.

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/)*
 
-- [1.0.0-dev (upcoming)](#100-dev-upcoming)
+- [1.1.0-dev (upcoming)](#110-dev-upcoming)
+- [1.1.0 (2020-02-29)](#110-2020-02-29)
 - [v1.0.0 (2020-02-23)](#v100-2020-02-23)
 - [v0.6.4 (2020-02-17)](#v064-2020-02-17)
 - [v0.6.3 (2020-02-05)](#v063-2020-02-05)
@@ -31,7 +32,11 @@ Change log
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-## 1.0.0-dev (upcoming)
+## 1.1.0-dev (upcoming)
+
+- TBD
+
+## 1.1.0 (2020-02-29)
 
 - add `minRow` and `row` grid options (which set minRow=maxRow=N) [1172](https://github.com/gridstack/gridstack.js/issues/1172) - thanks [@RadoiAndrei](https://github.com/RadoiAndrei)
 - fix [1166](https://github.com/gridstack/gridstack.js/issues/1166) resize not taking margin height into account - thanks [@awjae](https://github.com/awjae)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "1.0.0-dev",
+  "version": "1.1.0-dev",
   "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.0.0-dev extra CSS for [2-11] columns (non default)
+ * gridstack 1.1.0-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.

src/gridstack-poly.js

@@ -1,4 +1,4 @@
-/** gridstack.js 1.0.0-dev - IE and older browsers Polyfills for this library @preserve*/
+/** gridstack.js 1.1.0-dev - 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.0.0-dev
+// Type definitions for Gridstack 1.1.0-dev
 // Project: https://gridstackjs.com/
 // Definitions by: Pascal Senn <https://github.com/PascalSenn>
 //                 Ricky Blankenaufulland <https://github.com/ZoolWay>
@@ -569,6 +569,12 @@ interface GridstackOptions {
    */
   maxRow ? : number;
 
+  /** 
+   * minimum rows amount. Default is `0`. You can also do this with `min-height` CSS attribute
+   * on the grid div in pixels, which will round to the closest row.
+   */
+  minRow?: number;
+
   /**
    * minimal width. If window width is less, grid will be shown in one column mode (default?: 768)
    */
@@ -605,6 +611,12 @@ interface GridstackOptions {
    */
   removeTimeout ? : number;
 
+  /**
+   * fix grid number of rows. This is a shortcut of writing `minRow:N, maxRow:N`.
+   * (default `0` no constrain)
+   */
+  row?: number;
+
   /**
    * if true turns grid to RTL. Possible values are true, false, 'auto' (default?: 'auto')
    * See [example](http://gridstack.github.io/gridstack.js/demo/rtl.html)

src/gridstack.jQueryUI.js

@@ -1,4 +1,4 @@
-/** gridstack.js 1.0.0-dev - JQuery UI Drag&Drop plugin @preserve */
+/** gridstack.js 1.1.0-dev - 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.0.0-dev
+ * gridstack.js 1.1.0-dev
  * 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.0.0-dev CSS for default 12 and 1 columnMode size. Use gridstack-extra.css for others
+ * required gridstack 1.1.0-dev 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.