Merge branch 'master' of https://github.com/CMLL/gridstack.js into CMLL-master

troolee · troolee · commit 3f395720adf7 · 2017-04-11T00:07:01.000-07:00
diff --git a/src/gridstack.js b/src/gridstack.js
@@ -938,9 +938,9 @@
 
         if (typeof maxHeight == 'undefined') {
             maxHeight = this._styles._max;
-            this._initStyles();
-            this._updateContainerHeight();
         }
+        this._initStyles();
+        this._updateContainerHeight();
         if (!this.opts.cellHeight) { // The rest will be handled by CSS
             return ;
         }

Original file line number	Diff line number	Diff line change
`@@ -938,9 +938,9 @@`
`938`	`938`
`939`	`939`	`if (typeof maxHeight == 'undefined') {`
`940`	`940`	`maxHeight = this._styles._max;`
`941`		`- this._initStyles();`
`942`		`- this._updateContainerHeight();`
`943`	`941`	`}`
	`942`	`+ this._initStyles();`
	`943`	`+ this._updateContainerHeight();`
`944`	`944`	`if (!this.opts.cellHeight) { // The rest will be handled by CSS`
`945`	`945`	`return ;`
`946`	`946`	`}`