diff options
Diffstat (limited to 'core/js/jquery.ocdialog.js')
| -rw-r--r-- | core/js/jquery.ocdialog.js | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js index 449c97ca01b..b54cce2c0ca 100644 --- a/core/js/jquery.ocdialog.js +++ b/core/js/jquery.ocdialog.js @@ -159,27 +159,16 @@ $.Widget.prototype._setOptions.apply(this, arguments); }, _setSizes: function() { - var content_height = this.$dialog.height(); + var lessHeight = 0; if(this.$title) { - content_height -= this.$title.outerHeight(true); + lessHeight += this.$title.outerHeight(true); } if(this.$buttonrow) { - content_height -= this.$buttonrow.outerHeight(true); - } - this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body'); - if (this.parent.height() > 0) { - content_height = Math.min(content_height, this.parent.height() - 20); - } - if (content_height> 0) { - this.element.css({ - height: content_height + 'px', - width: this.$dialog.innerWidth() - 30 + 'px' - }); - } else { - this.element.css({ - width : this.$dialog.innerWidth() - 30 + 'px' - }); + lessHeight += this.$buttonrow.outerHeight(true); } + this.element.css({ + 'height': 'calc(100% - ' + lessHeight + 'px)' + }); }, _createOverlay: function() { if(!this.options.modal) { |