TS: clone grid option

fix gridstack#1261 * also fixed karma-typescript to get line number again
adumesny · Apr 16, 2020 · 5b7f023 · 5b7f023
1 parent ab27114
commit 5b7f023
Show file tree

Hide file tree

Showing 4 changed files with 374 additions and 364 deletions.
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -43,6 +43,7 @@ Change log
 - fix [1229](https://github.com/gridstack/gridstack.js/issues/1229) `staticGrid` no longer disable oneColumnMode
 - fix [1195](https://github.com/gridstack/gridstack.js/issues/1195) options broken with ember hash helper - thanks [@btecu](https://github.com/btecu)
 - fix [1250](https://github.com/gridstack/gridstack.js/issues/1250) don't remove item from another grid
+- fix [1261](https://github.com/gridstack/gridstack.js/issues/1261) `init()` clones passed options so second doesn't affect first one
 
 ## 1.1.1 (2020-03-17)
 

diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
     "karma-chrome-launcher": "^3.1.0",
     "karma-cli": "^2.0.0",
     "karma-jasmine": "^3.1.1",
-    "karma-typescript": "^5.0.1",
+    "karma-typescript": "4.1.1",
     "node-sass": "^4.13.1",
     "puppeteer": "^2.1.1",
     "serve-static": "^1.14.1",

diff --git a/src/gridstack.ts b/src/gridstack.ts
@@ -72,7 +72,7 @@ export class GridStack {
       return null;
     }
     if (!el.gridstack) {
-      el.gridstack = new GridStack(el, options);
+      el.gridstack = new GridStack(el, Utils.clone(options));
     }
     return el.gridstack
   }
@@ -152,14 +152,11 @@ export class GridStack {
     obsoleteAttr(this.el, 'data-gs-height', 'data-gs-max-row', 'v0.5.3');
     obsoleteAttr(this.el, 'data-gs-current-height', 'data-gs-current-row', 'v1.0.0');
 
-    opts.itemClass = opts.itemClass || 'grid-stack-item';
-
     // if row property exists, replace minRow and maxRow instead
     if (opts.row) {
       opts.minRow = opts.maxRow = opts.row;
       delete opts.row;
     }
-
     let rowAttr = Utils.toNumber(el.getAttribute('data-gs-row'));
 
     // elements attributes override any passed options (like CSS style) - merge the two together
@@ -180,29 +177,28 @@ export class GridStack {
       staticGrid: false,
       _class: 'grid-stack-instance-' + (Math.random() * 10000).toFixed(0),
       animate: Utils.toBool(el.getAttribute('data-gs-animate')) || false,
-      alwaysShowResizeHandle: opts.alwaysShowResizeHandle || false,
-      resizable: Utils.defaults(opts.resizable || {}, {
+      alwaysShowResizeHandle: false,
+      resizable: {
         autoHide: !(opts.alwaysShowResizeHandle || false),
         handles: 'se'
-      }),
-      draggable: Utils.defaults(opts.draggable || {}, {
-        handle: (opts.handleClass ? '.' + opts.handleClass : (opts.handle ? opts.handle : '')) ||
-          '.grid-stack-item-content',
+      },
+      draggable: {
+        handle: (opts.handleClass ? '.' + opts.handleClass : (opts.handle ? opts.handle : '')) || '.grid-stack-item-content',
         scroll: false,
         appendTo: 'body'
-      }),
-      disableDrag: opts.disableDrag || false,
-      disableResize: opts.disableResize || false,
+      },
+      disableDrag: false,
+      disableResize: false,
       rtl: 'auto',
       removable: false,
-      removableOptions: Utils.defaults(opts.removableOptions || {}, {
+      removableOptions: {
         accept: '.' + opts.itemClass
-      }),
+      },
       removeTimeout: 2000,
       verticalMarginUnit: 'px',
       cellHeightUnit: 'px',
-      disableOneColumnMode: opts.disableOneColumnMode || false,
-      oneColumnModeDomSort: opts.oneColumnModeDomSort
+      disableOneColumnMode: false,
+      oneColumnModeDomSort: false
     };
 
     this.opts = Utils.defaults(opts, defaults);