Skip to content

Commit b0c24c0

Browse files
committed
Merge branch 'develop'
2 parents 5471439 + 2037a70 commit b0c24c0

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/gridstack.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -947,14 +947,14 @@
947947
if (typeof maxHeight == 'undefined') {
948948
maxHeight = this._styles._max;
949949
}
950+
if (this._styles._max !== 0 && maxHeight <= this._styles._max) { // Keep this._styles._max increasing
951+
return ;
952+
}
950953
this._initStyles();
951954
this._updateContainerHeight();
952955
if (!this.opts.cellHeight) { // The rest will be handled by CSS
953956
return ;
954957
}
955-
if (this._styles._max !== 0 && maxHeight <= this._styles._max) {
956-
return ;
957-
}
958958

959959
if (!this.opts.verticalMargin || this.opts.cellHeightUnit === this.opts.verticalMarginUnit) {
960960
getHeight = function(nbRows, nbMargins) {

0 commit comments

Comments
 (0)