Skip to content

Commit

Permalink
Merge pull request #1565 from adumesny/develop
Browse files Browse the repository at this point in the history
rev 3.1.4
  • Loading branch information
adumesny authored Jan 12, 2021
2 parents e7065dc + cb93d82 commit 5a717ea
Show file tree
Hide file tree
Showing 22 changed files with 28 additions and 24 deletions.
10 changes: 7 additions & 3 deletions doc/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)*

- [3.1.3-dev](#313-dev)
- [3.1.4-dev](#314-dev)
- [3.1.4 (2021-1-11)](#314-2021-1-11)
- [3.1.3 (2021-1-2)](#313-2021-1-2)
- [3.1.2 (2020-12-7)](#312-2020-12-7)
- [3.1.0 (2020-12-4)](#310-2020-12-4)
Expand Down Expand Up @@ -44,10 +45,13 @@ Change log
- [v0.1.0 (2014-11-18)](#v010-2014-11-18)

<!-- END doctoc generated TOC please keep comment here to allow auto update -->
## 3.1.3-dev
## 3.1.4-dev

- TBD
## 3.1.4 (2021-1-11)

- fix [1557](https://github.com/gridstack/gridstack.js/pull/1557) fix no-drop cursor on windows when dragging within a default grid (no external drag in)
- fix [1541](https://github.com/gridstack/gridstack.js/pull/1541) fix Safari H5 elay when dropping items
- fix [1541](https://github.com/gridstack/gridstack.js/pull/1541) fix Safari H5 delay when dropping items

## 3.1.3 (2021-1-2)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gridstack",
"version": "3.1.3-dev",
"version": "3.1.4",
"description": "TypeScript/Javascript lib for dashboard layout and creation, no external dependencies, with many wrappers (React, Angular, Ember, knockout...)",
"main": "./dist/gridstack.js",
"types": "./dist/gridstack.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack-dd.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// gridstack-GridStackDD.get().ts 3.1.3-dev @preserve
// gridstack-GridStackDD.get().ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack-ddi.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// gridstack-ddi.ts 3.1.3-dev @preserve
// gridstack-ddi.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack-engine.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// gridstack-engine.ts 3.1.3-dev @preserve
// gridstack-engine.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack-extra.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* gridstack 3.1.3-dev extra CSS for [2-11] columns (non default)
* gridstack 3.1.4 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.
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* gridstack 3.1.3-dev required CSS for default 12 and 1 column Mode size. Use gridstack-extra.css for column [2-11], else see https://github.com/gridstack/gridstack.js#custom-columns-css
* gridstack 3.1.4 required CSS for default 12 and 1 column Mode size. Use gridstack-extra.css for column [2-11], else see https://github.com/gridstack/gridstack.js#custom-columns-css
* https://gridstackjs.com/
* (c) 2014-2020 Alain Dumesny, Dylan Weiss, Pavel Reznikov
* gridstack.js may be freely distributed under the MIT license.
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// gridstack.ts 3.1.3-dev @preserve
// gridstack.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/h5/dd-base-impl.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dd-base-impl.ts 3.1.3-dev @preserve
// dd-base-impl.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/h5/dd-draggable.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dd-draggable.ts 3.1.3-dev @preserve
// dd-draggable.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/h5/dd-droppable.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dd-droppable.ts 3.1.3-dev @preserve
// dd-droppable.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/h5/dd-element.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dd-elements.ts 3.1.3-dev @preserve
// dd-elements.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/h5/dd-manager.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dd-manager.ts 3.1.3-dev @preserve
// dd-manager.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/h5/dd-resizable-handle.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dd-resizable-handle.ts 3.1.3-dev @preserve
// dd-resizable-handle.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/h5/dd-resizable.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dd-resizable.ts 3.1.3-dev @preserve
// dd-resizable.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/h5/dd-utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// dd-utils.ts 3.1.3-dev @preserve
// dd-utils.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/h5/gridstack-dd-native.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// gridstack-dd-native.ts 3.1.3-dev @preserve
// gridstack-dd-native.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/index-h5.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// index.html5.ts 3.1.3-dev - everything you need for a Grid that uses HTML5 native drag&drop (work in progress) @preserve
// index.html5.ts 3.1.4 - everything you need for a Grid that uses HTML5 native drag&drop (work in progress) @preserve

// import './gridstack-poly.js';

Expand Down
2 changes: 1 addition & 1 deletion src/index-jq.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// index.jq.ts 3.1.3-dev - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature) @preserve
// index.jq.ts 3.1.4 - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature) @preserve

// import './gridstack-poly.js';

Expand Down
2 changes: 1 addition & 1 deletion src/index-static.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// index.static.ts 3.1.3-dev - everything you need for a static Grid (non draggable) @preserve
// index.static.ts 3.1.4 - everything you need for a static Grid (non draggable) @preserve

// import './gridstack-poly.js';

Expand Down
2 changes: 1 addition & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// types.ts 3.1.3-dev @preserve
// types.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down
2 changes: 1 addition & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// utils.ts 3.1.3-dev @preserve
// utils.ts 3.1.4 @preserve

/**
* https://gridstackjs.com/
Expand Down

0 comments on commit 5a717ea

Please sign in to comment.