Merge pull request #786 from adumesny/develop

fixed cellHeight() check for no-op return

spec/gridstack-spec.js

@@ -244,6 +244,38 @@ describe('gridstack', function() {
         });
     });
 
+    describe('grid.cellHeight', function() {
+        beforeEach(function() {
+            document.body.insertAdjacentHTML(
+                'afterbegin', gridstackHTML);
+        });
+        afterEach(function() {
+            document.body.removeChild(document.getElementsByClassName('grid-stack')[0]);
+        });
+        it('should have no changes', function() {
+            var options = {
+                cellHeight: 80,
+                verticalMargin: 10,
+                width: 12
+            };
+            $('.grid-stack').gridstack(options);
+            var grid = $('.grid-stack').data('gridstack');
+            grid.cellHeight( grid.cellHeight() );
+            expect(grid.cellHeight()).toBe(80);
+        });
+        it('should change cellHeight to 120', function() {
+            var options = {
+                cellHeight: 80,
+                verticalMargin: 10,
+                width: 10
+            };
+            $('.grid-stack').gridstack(options);
+            var grid = $('.grid-stack').data('gridstack');
+            grid.cellHeight( 120 );
+            expect(grid.cellHeight()).toBe(120);
+        });
+    });
+
     describe('grid.minWidth', function() {
         beforeEach(function() {
             document.body.insertAdjacentHTML(

src/gridstack.js

@@ -1610,7 +1610,7 @@
         }
         var heightData = Utils.parseHeight(val);
 
-        if (this.opts.cellHeightUnit === heightData.heightUnit && this.opts.height === heightData.height) {
+        if (this.opts.cellHeightUnit === heightData.unit && this.opts.cellHeight === heightData.height) {
             return ;
         }
         this.opts.cellHeightUnit = heightData.unit;