Merge pull request #1299 from adumesny/typescript

adumesny · web-flow · commit e25a00ca575f · 2020-07-05T09:41:06.000-07:00
TS: fix for #810 many columns roundoff error
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -40,6 +40,7 @@ Change log
 - add `getGridItems()` to return list of HTML grid items
 - add `{dragIn | dragInOptions}` grid attributes to handle external drag&drop items
 - add `save()` and `restore()` to serialize grids from JSON, saving all attributes (not just w,h,x,y) [1286](https://github.com/gridstack/gridstack.js/issues/1286)
+- fix [1299](https://github.com/gridstack/gridstack.js/pull/1299) many columns round-off error
 
 ## 1.1.2 (2020-05-17)
 
diff --git a/spec/e2e/html/810-many-columns.html b/spec/e2e/html/810-many-columns.html
@@ -8,11 +8,7 @@
 
   <link rel="stylesheet" href="../../../demo/demo.css"/>
   <link rel="stylesheet" href="810-many-columns.css"/>
-
-  <script src="../../../dist/jquery.min.js"></script>
-  <script src="../../../dist/jquery-ui.min.js"></script>
-  <script src="../../../src/gridstack.js"></script>
-  <script src="../../../src/gridstack.jQueryUI.js"></script>
+  <script src="../../../dist/gridstack.all.js"></script>
 </head>
 <body>
   <div class="container-fluid">
@@ -30,8 +26,7 @@ <h1>Many Columns demo</h1>
     let count = 0;
     let options = {
       column: COLUMNS,
-      cellHeight: 'auto',
-      float: false
+      cellHeight: 'auto'
     };
     let grid = GridStack.init(options);
 
diff --git a/src/gridstack.ts b/src/gridstack.ts
@@ -424,7 +424,7 @@ export class GridStack {
    */
   public cellWidth(): number {
     // TODO: take margin into account (horizontal_padding in .scss) to make cellHeight='auto' square ? (see 810-many-columns.html)
-    return Math.round(this.el.offsetWidth / this.opts.column);
+    return this.el.offsetWidth / this.opts.column;
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ export class GridStack {`
`424`	`424`	`*/`
`425`	`425`	`public cellWidth(): number {`
`426`	`426`	`// TODO: take margin into account (horizontal_padding in .scss) to make cellHeight='auto' square ? (see 810-many-columns.html)`
`427`		`- return Math.round(this.el.offsetWidth / this.opts.column);`
	`427`	`+ return this.el.offsetWidth / this.opts.column;`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`/**`