Skip to content

Commit

Permalink
Merge pull request #510 from radiolips/bugfix/505
Browse files Browse the repository at this point in the history
Bugfix/505
  • Loading branch information
radiolips authored Aug 17, 2016
2 parents 9c0bcd7 + 4ae4540 commit 0d7c8ed
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions dist/gridstack.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 0d7c8ed

Please sign in to comment.