From: john Date: Wed, 26 Sep 2018 03:46:18 +0000 (+0800) Subject: Roo/bootstrap/Modal.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=f5b20af7269ddae672d5682b30e6e40c73987d37 Roo/bootstrap/Modal.js --- diff --git a/Roo/bootstrap/Modal.js b/Roo/bootstrap/Modal.js index 54ae6de120..d08c050694 100644 --- a/Roo/bootstrap/Modal.js +++ b/Roo/bootstrap/Modal.js @@ -284,10 +284,7 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component, { full_height += body_childs[i].offsetHeight; } - if(body_height + this.headerEl.getHeight() + this.footerEl.getHeight() > view_height) { - this.setSize(w, Math.min); - } - + this.setSize(w, Math.min(full_height, view_height)); } },