Skip to content

Commit a749a93

Browse files
committed
Merge branch 'feature/dd-plugins'
2 parents 67dc2dd + 999020b commit a749a93

21 files changed

+377
-104
lines changed

Gruntfile.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ module.exports = function(grunt) {
3737
copy: {
3838
dist: {
3939
files: {
40-
'dist/gridstack.js': ['src/gridstack.js']
40+
'dist/gridstack.js': ['src/gridstack.js'],
41+
'dist/gridstack.jQueryUI.js': ['src/gridstack.jQueryUI.js'],
4142
}
4243
}
4344
},
@@ -50,7 +51,9 @@ module.exports = function(grunt) {
5051
},
5152
dist: {
5253
files: {
53-
'dist/gridstack.min.js': ['src/gridstack.js']
54+
'dist/gridstack.min.js': ['src/gridstack.js'],
55+
'dist/gridstack.jQueryUI.js': ['src/gridstack.jQueryUI.js'],
56+
'dist/gridstack.all.js': ['src/gridstack.js', 'src/gridstack.jQueryUI.js']
5457
}
5558
}
5659
},

README.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Join gridstack.js on Slack: https://gridstackjs.troolee.com
2525
- [Requirements](#requirements)
2626
- [Install](#install)
2727
- [Basic usage](#basic-usage)
28+
- [Migrating to v0.2.7](#migrating-to-v027)
2829
- [Migrating to v0.2.5](#migrating-to-v025)
2930
- [API Documentation](#api-documentation)
3031
- [Questions and Answers](#questions-and-answers)
@@ -129,6 +130,25 @@ $(function () {
129130
</script>
130131
```
131132

133+
## Migrating to v0.2.7
134+
135+
As of v0.2.7, gridstack introduces a new plugin system. The drag'n'drop functionality has been modified to take advantage of this system. Because of this, and to avoid dependency on core code from jQuery UI, the plugin was functionality was moved to a separate file.
136+
137+
To ensure gridstack continues to work, either include the additional `gridstack.jQueryUI.js` file into your HTML or use `gridstack.all.js`:
138+
139+
```html
140+
<script src="gridstack.js"></script>
141+
<script src="gridstack.jQueryUI.js"></script>
142+
```
143+
144+
or
145+
146+
```html
147+
<script src="gridstack.all.js"></script>
148+
```
149+
150+
We're working on implementing support for other drag'n'drop libraries through the new plugin system.
151+
132152
## Migrating to v0.2.5
133153

134154
As of v0.2.5 all methods and parameters are in camel case to respect [JavaScript Style Guide and Coding Conventions](http://www.w3schools.com/js/js_conventions.asp).

demo/anijs.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
2121
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
2222
<script src="../dist/gridstack.js"></script>
23+
<script src="../dist/gridstack.jQueryUI.js"></script>
2324

2425
<style type="text/css">
2526
.grid-stack {

demo/float.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
1919
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
2020
<script src="../dist/gridstack.js"></script>
21+
<script src="../dist/gridstack.jQueryUI.js"></script>
2122

2223
<style type="text/css">
2324
.grid-stack {

demo/knockout.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
2020
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.2.0/knockout-min.js"></script>
2121
<script src="../dist/gridstack.js"></script>
22+
<script src="../dist/gridstack.jQueryUI.js"></script>
2223

2324
<style type="text/css">
2425
.grid-stack {

demo/knockout2.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
2020
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.2.0/knockout-min.js"></script>
2121
<script src="../dist/gridstack.js"></script>
22+
<script src="../dist/gridstack.jQueryUI.js"></script>
2223

2324
<style type="text/css">
2425
.grid-stack {

demo/nested.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
1919
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
2020
<script src="../dist/gridstack.js"></script>
21+
<script src="../dist/gridstack.jQueryUI.js"></script>
2122

2223
<style type="text/css">
2324
.grid-stack {

demo/responsive.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
2020
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
2121
<script src="../dist/gridstack.js"></script>
22+
<script src="../dist/gridstack.jQueryUI.js"></script>
2223

2324
<style type="text/css">
2425
.grid-stack {

demo/rtl.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
2020
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.2.0/knockout-min.js"></script>
2121
<script src="../dist/gridstack.js"></script>
22+
<script src="../dist/gridstack.jQueryUI.js"></script>
2223

2324
<style type="text/css">
2425
.grid-stack {

demo/serialization.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
1919
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
2020
<script src="../dist/gridstack.js"></script>
21+
<script src="../dist/gridstack.jQueryUI.js"></script>
2122

2223
<style type="text/css">
2324
.grid-stack {

0 commit comments

Comments
 (0)