Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
5c605e4
update copyrights
troolee Aug 17, 2016
eebc0b1
0.2.7-dev
troolee Aug 17, 2016
39ffe9c
copyrights
troolee Aug 17, 2016
075c06f
Merge commit '39ffe9ca3dcf394035c763138ee29683622c014c'
radiolips Aug 17, 2016
a219acc
update cdn
troolee Aug 17, 2016
d3db46a
Update README.md
troolee Aug 17, 2016
f8b56af
Update README.md
troolee Aug 17, 2016
7616459
Merge commit 'f8b56af17bbc466cbf85efb281812296242c8cd5'
radiolips Aug 17, 2016
af0f2d2
Fix #462 and remove 768px CSS limitation.
radiolips Aug 17, 2016
f1cdbe2
Merge pull request #512 from radiolips/bugfix/462
radiolips Aug 17, 2016
01a27c6
Merge commit 'f1cdbe27c991b6eb96305df106d439ef0b322699'
radiolips Aug 18, 2016
30b096d
dd plugin draft
troolee Aug 18, 2016
78f0073
fix lint errors
troolee Aug 18, 2016
64ea5c4
Add `isNodeChangedPosition`.
radiolips Aug 18, 2016
67dc2dd
Merge pull request #514 from radiolips/feature/isNodeChangedPosition
radiolips Aug 18, 2016
0b3b47c
merge with master
troolee Aug 19, 2016
eeff06d
incapsulate drag/drop into plugin
troolee Aug 19, 2016
6d8ce22
dd plugin registration
troolee Aug 19, 2016
7cb3da3
fix direct resizable calling
troolee Aug 19, 2016
3f193db
move jQueryUI plugin to separate file
troolee Aug 19, 2016
a9a332c
update gruntfile/karma
troolee Aug 19, 2016
625a837
update tests
troolee Aug 19, 2016
bc4d076
update demo
troolee Aug 19, 2016
56d9ec3
build js
troolee Aug 19, 2016
e946084
update docs
troolee Aug 19, 2016
6122ca4
Merge commit '67dc2dd85ce42746dbe22f988bd9ca3aae945501'
radiolips Aug 19, 2016
46b857a
copy
troolee Aug 20, 2016
6ca1952
migrating to 0.2.7 notes
troolee Aug 20, 2016
5bc7d51
build js
troolee Aug 20, 2016
999020b
fix amd
troolee Aug 20, 2016
a749a93
Merge branch 'feature/dd-plugins'
troolee Aug 20, 2016
6e4c6d2
change log
troolee Aug 20, 2016
ca95e7b
update requirements section
troolee Aug 20, 2016
6ebd7a2
0.2.7-dev -> 0.3.0-dev
troolee Aug 20, 2016
0102470
update install instruction
troolee Aug 20, 2016
79d9b42
fix dist
troolee Aug 20, 2016
8dc5916
update install instructions
troolee Aug 20, 2016
8a554b3
typo
troolee Aug 20, 2016
215a6f1
Merge commit '8a554b37c5dea0036d695596ef68985120d9b83d'
radiolips Aug 20, 2016
5cf92a3
Only run checks for drag and resize if x, y, width, or height have ch…
radiolips Aug 21, 2016
2f2c6bb
Merge pull request #518 from radiolips/bugfix/actually-optimize-drag-…
radiolips Aug 21, 2016
4383fc8
Delete not needed </script> tag
madeITBelgium Sep 28, 2016
bd8bbff
fixed ie8 not support
lpyt Sep 29, 2016
016c161
Merge pull request #532 from lpyt/patch-1
troolee Oct 3, 2016
6d5f189
Merge pull request #531 from madeITBelgium/patch-1
troolee Oct 3, 2016
9007eea
Revert "fixed ie8 not support"
troolee Oct 3, 2016
b0e68ca
Merge pull request #534 from troolee/revert-532-patch-1
troolee Oct 3, 2016
ff547b5
Merge pull request #535 from troolee/releases
troolee Oct 3, 2016
c1c4ff8
build js
troolee Oct 3, 2016
c920420
Always create the styles to avoid an error that prevented the height …
CMLL Feb 8, 2017
2618e63
add disableOneColumnMode option
Feb 21, 2017
9b3a6ba
fix lint error
troolee Apr 11, 2017
7a7aed5
build js
troolee Apr 11, 2017
7d13123
Merge branch 'grotup-disableOneColumnMode' into develop
troolee Apr 11, 2017
3f39572
Merge branch 'master' of https://github.com/CMLL/gridstack.js into CM…
troolee Apr 11, 2017
8dc6b74
build js
troolee Apr 11, 2017
aaf7a09
Merge branch 'CMLL-master' into develop
troolee Apr 11, 2017
0520073
trying to make ci working again
troolee Apr 11, 2017
88a328a
fixing protractir
troolee Apr 11, 2017
2e3c35b
selenium-webdriver
troolee Apr 11, 2017
ec5f7a0
disable e2e tests for now :(
troolee Apr 11, 2017
8e48985
Merge branch 'bugfix/ci' into develop
troolee Apr 11, 2017
f1a407b
Fixes #593.
radiolips Apr 20, 2017
7ff2990
Merge pull request #632 from radiolips/bugfix/593
radiolips Apr 20, 2017
c4fa132
Fixes #577 by introducing a new event (jqui was emitting resizestop a…
radiolips Apr 20, 2017
8dbcb21
Update documentation.
radiolips Apr 20, 2017
21080f1
Merge pull request #633 from radiolips/bugfix/577
radiolips Apr 20, 2017
4d714b3
Update dev-dependencies. Remove checks for $.ui (unnecessary with new…
radiolips Apr 20, 2017
36fea94
Sorry doctor.
radiolips Apr 20, 2017
a7fd507
Merge pull request #634 from radiolips/feature/remove-ui-update-deps
radiolips Apr 20, 2017
f695d22
Update grunt and doctoc!
radiolips Apr 20, 2017
66f46ce
Merge pull request #635 from radiolips/feature/grunt-doctoc
radiolips Apr 20, 2017
1bc10c1
#550 #607
radiolips Apr 21, 2017
0737233
Merge pull request #638 from radiolips/bugfix/550
radiolips Apr 21, 2017
a1448f7
Preparing to release 0.3.0.
radiolips Apr 22, 2017
8ea752d
Merge pull request #639 from radiolips/feature/030-prep
radiolips Apr 22, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 5.7.0
- 7.7.2
env:
- CXX=g++-4.8
addons:
Expand All @@ -10,11 +10,12 @@ addons:
packages:
- g++-4.8
before_install:
- npm install -g protractor
- npm install -g protractor@3.3.0
install:
- npm install -g npm@2
- npm install -g grunt-cli
- npm install -g bower
- npm install selenium-webdriver
- bower install
- npm install
- ./node_modules/protractor/bin/webdriver-manager update --standalone
Expand All @@ -25,7 +26,7 @@ before_script:
script:
- npm run build
- npm test
- grunt e2e-test
# - grunt e2e-test
notifications:
slack:
secure: iGLGsYyVIyKVpVVCskGh/zc6Pkqe0D7jpUtbywSbnq6l5seE6bvBVqm0F2FSCIN+AIC+qal2mPEWysDVsLACm5tTEeA8NfL8dmCrAKbiFbi+gHl4mnHHCHl7ii/7UkoIIXNc5UXbgMSXRS5l8UcsSDlN8VxC5zWstbJvjeYIvbA=
7 changes: 5 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ module.exports = function(grunt) {
copy: {
dist: {
files: {
'dist/gridstack.js': ['src/gridstack.js']
'dist/gridstack.js': ['src/gridstack.js'],
'dist/gridstack.jQueryUI.js': ['src/gridstack.jQueryUI.js'],
}
}
},
Expand All @@ -50,7 +51,9 @@ module.exports = function(grunt) {
},
dist: {
files: {
'dist/gridstack.min.js': ['src/gridstack.js']
'dist/gridstack.min.js': ['src/gridstack.js'],
'dist/gridstack.jQueryUI.min.js': ['src/gridstack.jQueryUI.js'],
'dist/gridstack.all.js': ['src/gridstack.js', 'src/gridstack.jQueryUI.js']
}
}
},
Expand Down
3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2016 Pavel Reznikov
Copyright (c) 2014-2016 Pavel Reznikov, Dylan Weiss

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

59 changes: 53 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ Join gridstack.js on Slack: https://gridstackjs.troolee.com
- [Demo](#demo)
- [Usage](#usage)
- [Requirements](#requirements)
- [Using gridstack.js with jQuery UI](#using-gridstackjs-with-jquery-ui)
- [Install](#install)
- [Basic usage](#basic-usage)
- [Migrating to v0.3.0](#migrating-to-v030)
- [Migrating to v0.2.5](#migrating-to-v025)
- [API Documentation](#api-documentation)
- [Questions and Answers](#questions-and-answers)
Expand All @@ -45,7 +47,7 @@ Join gridstack.js on Slack: https://gridstackjs.troolee.com
- [Using AniJS](#using-anijs)
- [The Team](#the-team)
- [Changes](#changes)
- [v0.2.6 (Development version)](#v027-dev-development-version)
- [v0.3.0 (2017-04-21)](#v030-2017-04-21)
- [v0.2.6 (2016-08-17)](#v026-2016-08-17)
- [v0.2.5 (2016-03-02)](#v025-2016-03-02)
- [v0.2.4 (2016-02-15)](#v024-2016-02-15)
Expand All @@ -72,18 +74,27 @@ Usage

* [lodash.js](https://lodash.com) (>= 3.5.0, full build)
* [jQuery](http://jquery.com) (>= 3.1.0)
* [jQuery UI](http://jqueryui.com) (>= 1.12.0). Minimum required components: Core, Widget, Mouse, Draggable, Resizable
* (Optional) [jquery-ui-touch-punch](https://github.com/furf/jquery-ui-touch-punch) for touch-based devices support

Note: You can still use [underscore.js](http://underscorejs.org) (>= 1.7.0) instead of lodash.js

#### Using gridstack.js with jQuery UI

* [jQuery UI](http://jqueryui.com) (>= 1.12.0). Minimum required components: Core, Widget, Mouse, Draggable, Resizable
* (Optional) [jquery-ui-touch-punch](https://github.com/furf/jquery-ui-touch-punch) for touch-based devices support

## Install

```html
<link rel="stylesheet" href="gridstack.css" />
<script src="gridstack.js"></script>
<script src="gridstack.jQueryUI.js"></script>
```

* Using CDN:

```html
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/gridstack.js/0.2.5/gridstack.min.css" />
<script type="text/javascript" src='//cdnjs.cloudflare.com/ajax/libs/gridstack.js/0.2.5/gridstack.min.js'></script>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/gridstack.js/0.2.6/gridstack.min.css" />
<script type="text/javascript" src='//cdnjs.cloudflare.com/ajax/libs/gridstack.js/0.2.6/gridstack.min.js'></script>
```

* Using bower:
Expand Down Expand Up @@ -129,6 +140,25 @@ $(function () {
</script>
```

## Migrating to v0.3.0

As of v0.3.0, 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.

To ensure gridstack continues to work, either include the additional `gridstack.jQueryUI.js` file into your HTML or use `gridstack.all.js`:

```html
<script src="gridstack.js"></script>
<script src="gridstack.jQueryUI.js"></script>
```

or

```html
<script src="gridstack.all.js"></script>
```

We're working on implementing support for other drag'n'drop libraries through the new plugin system.

## Migrating to v0.2.5

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).
Expand Down Expand Up @@ -171,6 +201,8 @@ $(function () {
});
```

If you're still experiencing issues on touch devices please check [#444](https://github.com/troolee/gridstack.js/issues/444)

## Use with knockout.js

```javascript
Expand Down Expand Up @@ -475,6 +507,21 @@ for help.
Changes
=======

#### v0.3.0 (2017-04-21)

- remove placeholder when dragging widget below grid (already worked when dragging left, above, and to the right of grid).
- prevent extra checks for removing widget when dragging off grid.
- trigger `added` when a widget is added via dropping from one grid to another.
- trigger `removed` when a widget is removed via dropping from one grid to another.
- trigger `removed` when a widget is removed via dropping on a removable zone ([#607](https://github.com/troolee/gridstack.js/issues/607) and [#550])(https://github.com/troolee/gridstack.js/issues/550)).
- trigger custom event for `resizestop` called `gsresizestop` ([#577](https://github.com/troolee/gridstack.js/issues/577) and [#398](https://github.com/troolee/gridstack.js/issues/398)).
- prevent dragging/resizing in `oneColumnMode` ([#593](https://github.com/troolee/gridstack.js/issues/593)).
- add `oneColumnModeClass` option to grid.
- remove 768px CSS styles, moved to grid-stack-one-column-mode class.
- add max-width override on grid-stck-one-column-mode ([#462](https://github.com/troolee/gridstack.js/issues/462)).
- add internal function`isNodeChangedPosition`, minor optimization to move/drag.
- drag'n'drop plugin system. Move jQuery UI dependencies to separate plugin file.

#### v0.2.6 (2016-08-17)

- update requirements to the latest versions of jQuery (v3.1.0+) and jquery-ui (v1.12.0+).
Expand Down Expand Up @@ -575,7 +622,7 @@ License

The MIT License (MIT)

Copyright (c) 2014-2016 Pavel Reznikov
Copyright (c) 2014-2016 Pavel Reznikov, Dylan Weiss

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gridstack",
"version": "0.2.6",
"version": "0.3.0",
"homepage": "https://github.com/troolee/gridstack.js",
"authors": [
"Pavel Reznikov <pashka.reznikov@gmail.com>"
Expand Down
1 change: 1 addition & 0 deletions demo/anijs.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
<script src="../dist/gridstack.js"></script>
<script src="../dist/gridstack.jQueryUI.js"></script>

<style type="text/css">
.grid-stack {
Expand Down
1 change: 1 addition & 0 deletions demo/float.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
<script src="../dist/gridstack.js"></script>
<script src="../dist/gridstack.jQueryUI.js"></script>

<style type="text/css">
.grid-stack {
Expand Down
1 change: 1 addition & 0 deletions demo/knockout.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.2.0/knockout-min.js"></script>
<script src="../dist/gridstack.js"></script>
<script src="../dist/gridstack.jQueryUI.js"></script>

<style type="text/css">
.grid-stack {
Expand Down
1 change: 1 addition & 0 deletions demo/knockout2.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.2.0/knockout-min.js"></script>
<script src="../dist/gridstack.js"></script>
<script src="../dist/gridstack.jQueryUI.js"></script>

<style type="text/css">
.grid-stack {
Expand Down
1 change: 1 addition & 0 deletions demo/nested.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
<script src="../dist/gridstack.js"></script>
<script src="../dist/gridstack.jQueryUI.js"></script>

<style type="text/css">
.grid-stack {
Expand Down
2 changes: 1 addition & 1 deletion demo/responsive.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
<script src="../dist/gridstack.js"></script>
<script src="../dist/gridstack.jQueryUI.js"></script>

<style type="text/css">
.grid-stack {
Expand Down Expand Up @@ -117,6 +118,5 @@ <h1>Responsive grid demo</h1>
};
});
</script>
</script>
</body>
</html>
1 change: 1 addition & 0 deletions demo/rtl.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.2.0/knockout-min.js"></script>
<script src="../dist/gridstack.js"></script>
<script src="../dist/gridstack.jQueryUI.js"></script>

<style type="text/css">
.grid-stack {
Expand Down
1 change: 1 addition & 0 deletions demo/serialization.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
<script src="../dist/gridstack.js"></script>
<script src="../dist/gridstack.jQueryUI.js"></script>

<style type="text/css">
.grid-stack {
Expand Down
1 change: 1 addition & 0 deletions demo/two.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script>
<script src="../dist/gridstack.js"></script>
<script src="../dist/gridstack.jQueryUI.js"></script>

<style type="text/css">
#grid1 {
Expand Down
2 changes: 1 addition & 1 deletion dist/gridstack-extra.min.css

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions dist/gridstack.all.js

Large diffs are not rendered by default.

29 changes: 15 additions & 14 deletions dist/gridstack.css
Original file line number Diff line number Diff line change
Expand Up @@ -369,18 +369,19 @@
transition: left 0s, top 0s, height 0s, width 0s;
}

@media (max-width: 768px) {
.grid-stack-item {
position: relative !important;
width: auto !important;
left: 0 !important;
top: auto !important;
margin-bottom: 20px;
}
.grid-stack-item .ui-resizable-handle {
display: none;
}
.grid-stack {
height: auto !important;
}
.grid-stack.grid-stack-one-column-mode {
height: auto !important;
}

.grid-stack.grid-stack-one-column-mode > .grid-stack-item {
position: relative !important;
width: auto !important;
left: 0 !important;
top: auto !important;
margin-bottom: 20px;
max-width: none !important;
}

.grid-stack.grid-stack-one-column-mode > .grid-stack-item > .ui-resizable-handle {
display: none;
}
Loading