Merge commit '39ffe9ca3dcf394035c763138ee29683622c014c'

Author: radiolips

LICENSE

@@ -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
@@ -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.
-

README.md

@@ -45,7 +45,7 @@ Join gridstack.js on Slack: https://gridstackjs.troolee.com
   - [Using AniJS](#using-anijs)
 - [The Team](#the-team)
 - [Changes](#changes)
-      - [v0.2.7-dev (Development version)](#v027-dev-development-version)
+      - [v0.2.7-dev (Development Version)](#v027-dev-development-version)
       - [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)
@@ -475,14 +475,14 @@ for help.
 Changes
 =======
 
-#### v0.2.7-dev (Development version)
-
-- update `destroy([detachGrid])` call ([#422](https://github.com/troolee/gridstack.js/issues/422)).
+#### v0.2.7-dev (Development Version)
 
 #### v0.2.6 (2016-08-17)
 
 - update requirements to the latest versions of jQuery (v3.1.0+) and jquery-ui (v1.12.0+).
 - fix jQuery `size()` ([#486](https://github.com/troolee/gridstack.js/issues/486)).
+- 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)).
 - update _notify to allow detach ([#411](https://github.com/troolee/gridstack.js/issues/411)).
 - fix code that checks for jquery-ui ([#481](https://github.com/troolee/gridstack.js/issues/481)).
 - fix `cellWidth` calculation on empty grid
@@ -577,7 +577,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

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "0.2.6-dev",
+  "version": "0.2.7-dev",
   "homepage": "https://github.com/troolee/gridstack.js",
   "authors": [
     "Pavel Reznikov <pashka.reznikov@gmail.com>"

dist/gridstack.js

@@ -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

dist/gridstack.min.js

@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "0.2.6-dev",
+  "version": "0.2.7-dev",
   "description": "gridstack.js is a jQuery plugin for widget layout",
   "main": "dist/gridstack.js",
   "repository": {

dist/gridstack.min.map

@@ -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