Commit b0c24c08 authored by Dylan Weiss's avatar Dylan Weiss
Browse files

Merge branch 'develop'

parents 54714396 2037a70f
...@@ -947,14 +947,14 @@ ...@@ -947,14 +947,14 @@
if (typeof maxHeight == 'undefined') { if (typeof maxHeight == 'undefined') {
maxHeight = this._styles._max; maxHeight = this._styles._max;
} }
if (this._styles._max !== 0 && maxHeight <= this._styles._max) { // Keep this._styles._max increasing
return ;
}
this._initStyles(); this._initStyles();
this._updateContainerHeight(); this._updateContainerHeight();
if (!this.opts.cellHeight) { // The rest will be handled by CSS if (!this.opts.cellHeight) { // The rest will be handled by CSS
return ; return ;
} }
if (this._styles._max !== 0 && maxHeight <= this._styles._max) {
return ;
}
if (!this.opts.verticalMargin || this.opts.cellHeightUnit === this.opts.verticalMarginUnit) { if (!this.opts.verticalMargin || this.opts.cellHeightUnit === this.opts.verticalMarginUnit) {
getHeight = function(nbRows, nbMargins) { getHeight = function(nbRows, nbMargins) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment