Skip to content

Commit 3b11834

Browse files
author
Alain Dumesny
authored
Merge pull request #1060 from adumesny/develop
0.5.3 release
2 parents d745eb6 + ea9254d commit 3b11834

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ Usage
6868
* Using CDN:
6969

7070
```html
71-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].2/dist/gridstack.min.css" />
72-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/gridstack.min.js"></script>
73-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/gridstack.jQueryUI.min.js"></script>
71+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].3/dist/gridstack.min.css" />
72+
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].3/dist/gridstack.min.js"></script>
73+
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].3/dist/gridstack.jQueryUI.min.js"></script>
7474
```
7575

7676
* Using bower:
@@ -184,7 +184,7 @@ $('.grid-stack').gridstack( {column: N} );
184184

185185
2) and change your HTML accordingly if **N < 12** (else custom CSS section next). Without this, things will not render/work correctly.
186186
```html
187-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].2/dist/gridstack-extra.css"/>
187+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].3/dist/gridstack-extra.css"/>
188188

189189
<div class="grid-stack grid-stack-N">...</div>
190190
```

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gridstack",
3-
"version": "0.5.2-dev",
3+
"version": "0.5.3",
44
"homepage": "https://github.com/gridstack/gridstack.js",
55
"authors": [
66
"Pavel Reznikov <[email protected]>",

‎doc/CHANGES.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Change log
55
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
66
**Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)*
77

8-
- [v0.5.2-dev (upcoming changes)](#v052-dev-upcoming-changes)
8+
- [v0.5.3 (2019-11-20)](#v053-2019-11-20)
99
- [v0.5.2 (2019-11-13)](#v052-2019-11-13)
1010
- [v0.5.1 (2019-11-07)](#v051-2019-11-07)
1111
- [v0.5.0 (2019-11-06)](#v050-2019-11-06)
@@ -22,7 +22,7 @@ Change log
2222

2323
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
2424

25-
## v0.5.2-dev (upcoming changes)
25+
## v0.5.3 (2019-11-20)
2626

2727
- 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)).
2828
- 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)).

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gridstack",
3-
"version": "0.5.2-dev",
3+
"version": "0.5.3",
44
"description": "gridstack.js is a jQuery plugin for widget layout",
55
"main": "dist/gridstack.js",
66
"repository": {

‎demo/column.html‎ renamed to ‎spec/e2e/html/column.html‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
<title>Column grid demo</title>
1212

1313
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
14-
<link rel="stylesheet" href="../dist/gridstack.css"/>
14+
<link rel="stylesheet" href="../../../dist/gridstack.css"/>
15+
<link rel="stylesheet" href="../../../dist/gridstack-extra.css"/>
1516

1617
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
1718
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
1819
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
19-
<script src="../src/gridstack.js"></script>
20-
<script src="../src/gridstack.jQueryUI.js"></script>
20+
<script src="../../../src/gridstack.js"></script>
21+
<script src="../../../src/gridstack.jQueryUI.js"></script>
2122

2223
<style type="text/css">
2324
.grid-stack {
@@ -34,9 +35,10 @@
3435
<body>
3536
<div class="container-fluid">
3637
<h1>setColumn() grid demo</h1>
37-
<div>
38-
<a class="btn btn-primary" id="1column" href="#">1 Column</a>
39-
</div>
38+
<a class="btn btn-primary" id="1column" href="#">1 Column</a>
39+
<a class="btn btn-primary" id="2column" href="#">2 Column</a>
40+
<a class="btn btn-primary" id="6column" href="#">6 Column</a>
41+
<a class="btn btn-primary" id="12column" href="#">12 Column</a>
4042
<br><br>
4143
<div class="grid-stack"></div>
4244
</div>
@@ -49,20 +51,18 @@ <h1>setColumn() grid demo</h1>
4951
this.grid = $('.grid-stack').data('gridstack');
5052

5153
var items = [
52-
{x: 0, y: 0, width: 4, height: 2},
53-
{x: 4, y: 0, width: 4, height: 1},
54+
{x: 0, y: 0, width: 2, height: 2},
55+
{x: 2, y: 0, width: 2, height: 1},
56+
{x: 5, y: 0, width: 1, height: 1},
5457
];
5558
items.forEach(function (node, i) {
5659
self.grid.addWidget($('<div><div class="grid-stack-item-content">' + i + '</div></div>'), node);
5760
});
5861

59-
$('#1column').click(function() {
60-
oneColumn();
61-
});
62-
63-
function oneColumn() {
64-
self.grid.setColumn(1);
65-
}
62+
$('#1column').click(function() { self.grid.setColumn(1); });
63+
$('#2column').click(function() { self.grid.setColumn(2); });
64+
$('#6column').click(function() { self.grid.setColumn(6); });
65+
$('#12column').click(function() { self.grid.setColumn(12); });
6666
});
6767
</script>
6868
</body>

‎src/gridstack.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Type definitions for Gridstack 0.5.2
1+
// Type definitions for Gridstack 0.5.3
22
// Project: https://gridstackjs.com/
33
// Definitions by: Pascal Senn <https://github.com/PascalSenn>
44
// Ricky Blankenaufulland <https://github.com/ZoolWay>

‎src/gridstack.jQueryUI.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* gridstack.js 0.5.2-dev
2+
* gridstack.js 0.5.3
33
* https://gridstackjs.com/
44
* (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
55
* gridstack.js may be freely distributed under the MIT license.

‎src/gridstack.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* gridstack.js 0.5.2-dev
2+
* gridstack.js 0.5.3
33
* https://gridstackjs.com/
44
* (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
55
* gridstack.js may be freely distributed under the MIT license.

0 commit comments

Comments
 (0)