Merge pull request #1060 from adumesny/develop

0.5.3 release
gridstack · Nov 20, 2019 · 3b11834 · 3b11834
2 parents d745eb6 + ea9254d
commit 3b11834
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -68,9 +68,9 @@ Usage
 * Using CDN:
 
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].2/dist/gridstack.min.css" />
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/gridstack.min.js"></script>
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/gridstack.jQueryUI.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].3/dist/gridstack.min.css" />
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].3/dist/gridstack.min.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].3/dist/gridstack.jQueryUI.min.js"></script>
 ```
 
 * Using bower:
@@ -184,7 +184,7 @@ $('.grid-stack').gridstack( {column: N} );
 
 2) and change your HTML accordingly if **N < 12** (else custom CSS section next). Without this, things will not render/work correctly.
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].2/dist/gridstack-extra.css"/>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].3/dist/gridstack-extra.css"/>
 
 <div class="grid-stack grid-stack-N">...</div>
 ```

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "0.5.2-dev",
+  "version": "0.5.3",
   "homepage": "https://github.com/gridstack/gridstack.js",
   "authors": [
     "Pavel Reznikov <[email protected]>",

diff --git a/doc/CHANGES.md b/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/)*
 
-- [v0.5.2-dev (upcoming changes)](#v052-dev-upcoming-changes)
+- [v0.5.3 (2019-11-20)](#v053-2019-11-20)
 - [v0.5.2 (2019-11-13)](#v052-2019-11-13)
 - [v0.5.1 (2019-11-07)](#v051-2019-11-07)
 - [v0.5.0 (2019-11-06)](#v050-2019-11-06)
@@ -22,7 +22,7 @@ Change log
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-## v0.5.2-dev (upcoming changes)
+## v0.5.3 (2019-11-20)
 
 - grid options `width` is now `column`, `height` now `maxRow`, and `setGridWidth()` now `setColumn()` to match what they are. Old names are still supported (console warnings). Various fixes for custom # of column and re-wrote entire doc section ([#1053](https://github.com/gridstack/gridstack.js/issues/1053)).
 - fix widgets not animating when animate: true is used. on every move, styles were recreated-fix should slightly improve gridstack.js speed ([#937](https://github.com/gridstack/gridstack.js/issues/937)).

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "0.5.2-dev",
+  "version": "0.5.3",
   "description": "gridstack.js is a jQuery plugin for widget layout",
   "main": "dist/gridstack.js",
   "repository": {

diff --git a/demo/column.html → spec/e2e/html/column.html b/demo/column.html → spec/e2e/html/column.html
@@ -11,13 +11,14 @@
   <title>Column grid demo</title>
 
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../dist/gridstack.css"/>
+  <link rel="stylesheet" href="../../../dist/gridstack.css"/>
+  <link rel="stylesheet" href="../../../dist/gridstack-extra.css"/>
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
-  <script src="../src/gridstack.js"></script>
-  <script src="../src/gridstack.jQueryUI.js"></script>
+  <script src="../../../src/gridstack.js"></script>
+  <script src="../../../src/gridstack.jQueryUI.js"></script>
 
   <style type="text/css">
     .grid-stack {
@@ -34,9 +35,10 @@
 <body>
   <div class="container-fluid">
     <h1>setColumn() grid demo</h1>
-    <div>
-      <a class="btn btn-primary" id="1column" href="#">1 Column</a>
-    </div>
+    <a class="btn btn-primary" id="1column" href="#">1 Column</a>
+    <a class="btn btn-primary" id="2column" href="#">2 Column</a>
+    <a class="btn btn-primary" id="6column" href="#">6 Column</a>
+    <a class="btn btn-primary" id="12column" href="#">12 Column</a>
     <br><br>
     <div class="grid-stack"></div>
   </div>
@@ -49,20 +51,18 @@ <h1>setColumn() grid demo</h1>
       this.grid = $('.grid-stack').data('gridstack');
 
       var items = [
-        {x: 0, y: 0, width: 4, height: 2},
-        {x: 4, y: 0, width: 4, height: 1},
+        {x: 0, y: 0, width: 2, height: 2},
+        {x: 2, y: 0, width: 2, height: 1},
+        {x: 5, y: 0, width: 1, height: 1},
       ];
       items.forEach(function (node, i) {
         self.grid.addWidget($('<div><div class="grid-stack-item-content">' + i + '</div></div>'), node);
       });
 
-      $('#1column').click(function() {
-        oneColumn();
-      });
-
-      function oneColumn() {
-        self.grid.setColumn(1);
-      }
+      $('#1column').click(function() { self.grid.setColumn(1); });
+      $('#2column').click(function() { self.grid.setColumn(2); });
+      $('#6column').click(function() { self.grid.setColumn(6); });
+      $('#12column').click(function() { self.grid.setColumn(12); });
     });
   </script>
 </body>

diff --git a/src/gridstack.d.ts b/src/gridstack.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Gridstack 0.5.2
+// Type definitions for Gridstack 0.5.3
 // Project: https://gridstackjs.com/
 // Definitions by: Pascal Senn <https://github.com/PascalSenn>
 //                 Ricky Blankenaufulland <https://github.com/ZoolWay>

diff --git a/src/gridstack.jQueryUI.js b/src/gridstack.jQueryUI.js
@@ -1,5 +1,5 @@
 /**
- * gridstack.js 0.5.2-dev
+ * gridstack.js 0.5.3
  * https://gridstackjs.com/
  * (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.

diff --git a/src/gridstack.js b/src/gridstack.js
@@ -1,5 +1,5 @@
 /**
- * gridstack.js 0.5.2-dev
+ * gridstack.js 0.5.3
  * https://gridstackjs.com/
  * (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.