deblan/gridstack.js
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #510 from radiolips/bugfix/505

Browse source 
Bugfix/505
This commit is contained in:
radiolips 2016-08-17 11:53:52 -04:00 committed by GitHub
parent 9c0bcd74e7 4ae4540bba
commit 0d7c8edc92
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -478,6 +478,7 @@ Changes
#### v0.2.7-dev (Development version)
- update `destroy([detachGrid])` call ([#422](https://github.com/troolee/gridstack.js/issues/422)).
- don't mutate options when calling `draggable` and `resizable`. ([#505](https://github.com/troolee/gridstack.js/issues/505)).
#### v0.2.6 (2016-08-17)

4
dist/gridstack.js vendored
View file

@ -1115,13 +1115,13 @@
};
el
.draggable(_.extend(this.opts.draggable, {
.draggable(_.extend({}, this.opts.draggable, {
containment: this.opts.isNested ? this.container.parent() : null,
start: onStartMoving,
stop: onEndMoving,
drag: dragOrResize
}))
.resizable(_.extend(this.opts.resizable, {
.resizable(_.extend({}, this.opts.resizable, {
start: onStartMoving,
stop: onEndMoving,
resize: dragOrResize

2
dist/gridstack.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/gridstack.min.map vendored
View file

File diff suppressed because one or more lines are too long

4
src/gridstack.js
View file

@ -1115,13 +1115,13 @@
};
el
.draggable(_.extend(this.opts.draggable, {
.draggable(_.extend({}, this.opts.draggable, {
containment: this.opts.isNested ? this.container.parent() : null,
start: onStartMoving,
stop: onEndMoving,
drag: dragOrResize
}))
.resizable(_.extend(this.opts.resizable, {
.resizable(_.extend({}, this.opts.resizable, {
start: onStartMoving,
stop: onEndMoving,
resize: dragOrResize