merge with master

gridstack · Aug 17, 2016 · 74a6ad6 · 74a6ad6
2 parents ae19e78 + fcd2327
commit 74a6ad6
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -480,6 +480,7 @@ Changes
 - fix jQuery `size()` ([#486](https://github.com/troolee/gridstack.js/issues/486)).
 - 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
 
 #### v0.2.5 (2016-03-02)
 

diff --git a/dist/gridstack.js b/dist/gridstack.js
@@ -1043,7 +1043,7 @@
             var o = $(this);
             self.grid.cleanNodes();
             self.grid.beginUpdate(node);
-            cellWidth = Math.ceil(o.outerWidth() / o.attr('data-gs-width'));
+            cellWidth = self.cellWidth();
             var strictCellHeight = Math.ceil(o.outerHeight() / o.attr('data-gs-height'));
             cellHeight = self.container.height() / parseInt(self.container.attr('data-gs-current-height'));
             self.placeholder
@@ -1494,8 +1494,7 @@
     };
 
     GridStack.prototype.cellWidth = function() {
-        var o = this.container.children('.' + this.opts.itemClass).first();
-        return Math.ceil(o.outerWidth() / parseInt(o.attr('data-gs-width'), 10));
+        return Math.round(this.container.outerWidth() / this.opts.width);
     };
 
     GridStack.prototype.getCellFromPixel = function(position, useOffset) {

diff --git a/dist/gridstack.min.js b/dist/gridstack.min.js
diff --git a/dist/gridstack.min.map b/dist/gridstack.min.map
diff --git a/spec/gridstack-spec.js b/spec/gridstack-spec.js
@@ -220,14 +220,27 @@ describe('gridstack', function() {
         afterEach(function() {
             document.body.removeChild(document.getElementsByClassName('grid-stack')[0]);
         });
-        it('should return 96.', function() {
+        it('should return 1/12th of container width.', function() {
             var options = {
                 cellHeight: 80,
-                verticalMargin: 10
+                verticalMargin: 10,
+                width: 12
+            };
+            $('.grid-stack').gridstack(options);
+            var grid = $('.grid-stack').data('gridstack');
+            var res = Math.round($('.grid-stack').outerWidth() / 12);
+            expect(grid.cellWidth()).toBe(res);
+        });
+        it('should return 1/10th of container width.', function() {
+            var options = {
+                cellHeight: 80,
+                verticalMargin: 10,
+                width: 10
             };
             $('.grid-stack').gridstack(options);
             var grid = $('.grid-stack').data('gridstack');
-            expect(grid.cellWidth()).toBe(96);
+            var res = Math.round($('.grid-stack').outerWidth() / 10);
+            expect(grid.cellWidth()).toBe(res);
         });
     });
 

diff --git a/src/gridstack.js b/src/gridstack.js
@@ -1043,7 +1043,7 @@
             var o = $(this);
             self.grid.cleanNodes();
             self.grid.beginUpdate(node);
-            cellWidth = Math.ceil(o.outerWidth() / o.attr('data-gs-width'));
+            cellWidth = self.cellWidth();
             var strictCellHeight = Math.ceil(o.outerHeight() / o.attr('data-gs-height'));
             cellHeight = self.container.height() / parseInt(self.container.attr('data-gs-current-height'));
             self.placeholder
@@ -1494,8 +1494,7 @@
     };
 
     GridStack.prototype.cellWidth = function() {
-        var o = this.container.children('.' + this.opts.itemClass).first();
-        return Math.ceil(o.outerWidth() / parseInt(o.attr('data-gs-width'), 10));
+        return Math.round(this.container.outerWidth() / this.opts.width);
     };
 
     GridStack.prototype.getCellFromPixel = function(position, useOffset) {