Skip to content

Commit 6b95508

Browse files
authored
Merge pull request #1722 from adumesny/master
latest tools
2 parents 0f6226c + de29321 commit 6b95508

24 files changed

+810
-659
lines changed

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-
- [4.2.0](#420)
8+
- [4.2.0 (2021-4-11)](#420-2021-4-11)
99
- [4.1.0 (2021-4-7)](#410-2021-4-7)
1010
- [4.0.3 (2021-3-28)](#403-2021-3-28)
1111
- [4.0.2 (2021-3-27)](#402-2021-3-27)
@@ -53,7 +53,7 @@ Change log
5353
- [v0.1.0 (2014-11-18)](#v010-2014-11-18)
5454

5555
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
56-
## 4.2.0
56+
## 4.2.0 (2021-4-11)
5757

5858
- fix [#1704](https://github.com/gridstack/gridstack.js/issues/1704) scrollbar fix broken in 4.x
5959
- fix [#1655](https://github.com/gridstack/gridstack.js/issues/1655) `addWidget()` while in 1 column now remembers original wanted width

package.json

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
{
22
"name": "gridstack",
3-
"version": "4.2.0",
3+
"version": "4.2.0-dev",
44
"description": "TypeScript/JS lib for dashboard layout and creation, no external dependencies, with many wrappers (React, Angular, Vue, Ember, knockout...)",
55
"main": "./dist/gridstack.js",
66
"types": "./dist/gridstack.d.ts",
77
"repository": {
88
"type": "git",
99
"url": "git+https://github.com/gridstack/gridstack.js.git"
1010
},
11-
"funding": [{
12-
"type" : "paypal",
13-
"url" : "https://www.paypal.me/alaind831"
14-
}, {
15-
"type" : "venmo",
16-
"url" : "https://www.venmo.com/adumesny"
17-
}],
11+
"funding": [
12+
{
13+
"type": "paypal",
14+
"url": "https://www.paypal.me/alaind831"
15+
},
16+
{
17+
"type": "venmo",
18+
"url": "https://www.venmo.com/adumesny"
19+
}
20+
],
1821
"scripts": {
1922
"build": "yarn --no-progress && rm -rf dist/* && grunt && webpack && tsc --stripInternal && yarn doc",
2023
"w": "rm -rf dist/* && grunt && webpack",
@@ -87,6 +90,6 @@
8790
"ts-loader": "^8.0.7",
8891
"typescript": "3.6.5",
8992
"webpack": "^5.3.2",
90-
"webpack-cli": "^4.2.0"
93+
"webpack-cli": "^4.6.0"
9194
}
9295
}

src/gridstack-dd.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* gridstack-dd.ts 4.2.0
2+
* gridstack-dd.ts 4.2.0-dev
33
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
44
*/
55

src/gridstack-ddi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* gridstack-ddi.ts 4.2.0
2+
* gridstack-ddi.ts 4.2.0-dev
33
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
44
*/
55

src/gridstack-engine.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* gridstack-engine.ts 4.2.0
2+
* gridstack-engine.ts 4.2.0-dev
33
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
44
*/
55

src/gridstack-h5.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* index-h5.ts 4.2.0 - everything you need for a Grid that uses HTML5 native drag&drop
2+
* index-h5.ts 4.2.0-dev - everything you need for a Grid that uses HTML5 native drag&drop
33
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
44
*/
55

src/gridstack-jq.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* index-jq.ts 4.2.0 - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature)
2+
* index-jq.ts 4.2.0-dev - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature)
33
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
44
*/
55

src/gridstack-poly.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* gridstack-poly.ts 4.2.0 - used for older browser support (not currently supported in v2+)
2+
* gridstack-poly.ts 4.2.0-dev - used for older browser support (not currently supported in v2+)
33
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
44
*/
55

src/gridstack-static.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* index-static.ts 4.2.0 - much smaller, everything you need for a static Grid (non draggable, API driven)
2+
* index-static.ts 4.2.0-dev - much smaller, everything you need for a static Grid (non draggable, API driven)
33
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
44
*/
55

src/gridstack.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* gridstack SASS styles 4.2.0
2+
* gridstack SASS styles 4.2.0-dev
33
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
44
*/
55

0 commit comments

Comments
 (0)