Roo/bootstrap/Modal.js

diff --git a/Roo/bootstrap/Modal.js b/Roo/bootstrap/Modal.js
index 989bd9e..c2dc2fb 100644 (file)
--- a/Roo/bootstrap/Modal.js
+++ b/Roo/bootstrap/Modal.js
@@ -279,13 +279,13 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
             
             var view_height = Roo.lib.Dom.getViewportHeight(true) - 60;
             var body_childs = this.bodyEl.dom.childNodes;
-            var body_height = 0;
+            var full_height = 0;
             for(var i = 0; i < body_childs.length; i++) {
-                body_height += body_childs[i].offsetHeight;
+                full_height += body_childs[i].offsetHeight;
             }
             
             if(body_height + this.headerEl.getHeight() + this.footerEl.getHeight() > view_height) {
-                this.setSize(w, this.height || view_height);
+                this.setSize(w, Math.min);
             }
             
         }