Roo/bootstrap/Modal.js

[roojs1] / Roo / bootstrap / Modal.js

diff --git a/Roo/bootstrap/Modal.js b/Roo/bootstrap/Modal.js
index 51433b2..f72a6e3 100644 (file)
--- a/Roo/bootstrap/Modal.js
+++ b/Roo/bootstrap/Modal.js
@@ -269,21 +269,29 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
         }
         
         if(!this.fitwindow && this.max_width !== 0){
+            
             var w = Math.min(this.max_width, Roo.lib.Dom.getViewportWidth(true) - 30);
-            // var h = this.height || Roo.lib.Dom.getViewportHeight(true) - 60;
-            this.setSize(w,this.height);
             
-            var view_height = Roo.lib.Dom.getViewportHeight(true) - 60;
+            // for fix height
+            if(this.height) {
+                this.setSize(w, this.height);
+                return;
+            }
             
-            if(
-                (
-                    this.headerEl.getHeight() + 
-                    this.bodyEl.getHeight() + 
-                    this.footerEl.getHeight()
-                ) > view_height) {
-            } {
-                this.setSize(w,view_height);
+            var body_childs = this.bodyEl.dom.childNodes;
+            var full_height = this.headerEl.getHeight() + this.footerEl.getHeight();
+            for(var i = 0; i < body_childs.length; i++) {
+                
+                if(body_childs[i].classList.indexOf('roo-layout-region') * 1 != -1) {
+                    
+                    var layout_childs = body_childs[i].childNodes;
+                    
+                }
+                
+                full_height += body_childs[i].offsetHeight;
             }
+            
+            // this.setSize(w, Math.min(full_height, Roo.lib.Dom.getViewportHeight(true) - 60));
         }
         
     },