Skip to content

Commit

Permalink
Merge pull request #1591 from adumesny/develop
Browse files Browse the repository at this point in the history
rev 3.2.0
  • Loading branch information
adumesny authored Jan 26, 2021
2 parents 5a35900 + cacc674 commit 115b9c4
Show file tree
Hide file tree
Showing 23 changed files with 29 additions and 29 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,23 @@ import 'gridstack/dist/gridstack.min.css';
import GridStack from 'gridstack';
// THEN to get HTML5 drag&drop
import 'gridstack/dist/h5/gridstack-dd-native';
// OR to get legacy jquery-ui drag&drop
// OR to get legacy jquery-ui drag&drop (support Mobile touch devices, h5 does not yet)
import 'gridstack/dist/jq/gridstack-dd-jqueryui';
// OR nothing to get static grids (API driven, no user drag&drop)
```
Alternatively in html

```html
<link href="node_modules/gridstack/dist/gridstack.min.css" rel="stylesheet"/>
<!-- HTML5 drag&drop (63k) -->
<!-- HTML5 drag&drop (64k) -->
<script src="node_modules/gridstack/dist/gridstack-h5.js"></script>
<!-- OR jquery-ui drag&drop (186k) -->
<!-- OR jquery-ui drag&drop (189k) -->
<script src="node_modules/gridstack/dist/gridstack-jq.js"></script>
<!-- OR static grid (34k) -->
<!-- OR static grid (36k) -->
<script src="node_modules/gridstack/dist/gridstack-static.js"></script>
```

Note: the API is the same, regardless of the plugin (or lack thereof) so you can switch at any time. The Jquery version will export $ that it bundles. Read more at [migrating to v3](#migrating-to-v3)
Note: the API is the same, regardless of the plugin (or lack thereof) so you can switch at any time. The Jquery version will export $ that it bundles and currently the only one to support mobile/touch devices through `jquery.ui.touch-punch` (h5 version is planned). Read more at [migrating to v3](#migrating-to-v3)

## Basic usage

Expand Down
6 changes: 3 additions & 3 deletions doc/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)*

- [3.1.5-dev](#315-dev)
- [3.2.0 (2021-1-25)](#320-2021-1-25)
- [3.1.5 (2021-1-23)](#315-2021-1-23)
- [3.1.4 (2021-1-11)](#314-2021-1-11)
- [3.1.3 (2021-1-2)](#313-2021-1-2)
Expand Down Expand Up @@ -46,10 +46,10 @@ 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.5-dev
## 3.2.0 (2021-1-25)

- fix [1413](https://github.com/gridstack/gridstack.js/issues/1413) website & lib works on mobile. We now compile the latest v1.0.8 `jquery.ui.touch-punch`
into the JQ version (only 2k) so mobile devices (android, iphone, ipad, touchpad) are supported out of the box.
into the JQ version (only 2k) so mobile devices (android, iphone, ipad, ms surface, etc...) are supported out of the box.
HTML5 version will require re-write to plain `mousemove` & mobile `touchmove` instead of drag events in a future release.

## 3.1.5 (2021-1-23)
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.5-dev",
"version": "3.2.0",
"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.5-dev @preserve
// gridstack-GridStackDD.get().ts 3.2.0 @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.5-dev @preserve
// gridstack-ddi.ts 3.2.0 @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.5-dev @preserve
// gridstack-engine.ts 3.2.0 @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.5-dev extra CSS for [2-11] columns (non default)
* gridstack 3.2.0 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.5-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.2.0 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.5-dev @preserve
// gridstack.ts 3.2.0 @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.5-dev @preserve
// dd-base-impl.ts 3.2.0 @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.5-dev @preserve
// dd-draggable.ts 3.2.0 @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.5-dev @preserve
// dd-droppable.ts 3.2.0 @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.5-dev @preserve
// dd-elements.ts 3.2.0 @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.5-dev @preserve
// dd-manager.ts 3.2.0 @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.5-dev @preserve
// dd-resizable-handle.ts 3.2.0 @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.5-dev @preserve
// dd-resizable.ts 3.2.0 @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.5-dev @preserve
// dd-utils.ts 3.2.0 @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.5-dev @preserve
// gridstack-dd-native.ts 3.2.0 @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.5-dev - everything you need for a Grid that uses HTML5 native drag&drop (work in progress) @preserve
// index.html5.ts 3.2.0 - 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.5-dev - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature) @preserve
// index.jq.ts 3.2.0 - 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.5-dev - everything you need for a static Grid (non draggable) @preserve
// index.static.ts 3.2.0 - 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.5-dev @preserve
// types.ts 3.2.0 @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.5-dev @preserve
// utils.ts 3.2.0 @preserve

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

0 comments on commit 115b9c4

Please sign in to comment.