sync

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index d62e9e5..2c229bb 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -2645,7 +2645,8 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
     size: '',
     
     max_width: 0,
-
+    
+    fit_content: false,
 
     onRender : function(ct, position)
     {
@@ -2833,14 +2834,30 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
             
             var w = Math.min(this.max_width, Roo.lib.Dom.getViewportWidth(true) - 30);
             
+            // for fix height
             if(this.height) {
                 this.setSize(w, this.height);
+                Roo.log('this height??');
+                return;
+            }
+            
+            if(!this.fit_content) {
+                Roo.log('not fitting???');
+                this.setSize(w, Roo.lib.Dom.getViewportHeight(true) - 60);
                 return;
             }
             
             var body_childs = this.bodyEl.dom.childNodes;
-            var full_height = this.headerEl.getHeight() + this.footerEl.getHeight() + 60;
+            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;
+                //     for(var j = 0; j < layout_childs.length; j++) {
+                // 
+                //     }
+                // }
+                
                 full_height += body_childs[i].offsetHeight;
             }
             
@@ -7834,6 +7851,8 @@ Roo.extend(Roo.bootstrap.Form, Roo.bootstrap.Component,  {
                 return;
             }
             
+            Roo.log('invalid field: ' + f.name);
+            
             valid = false;
 
             if(!target && f.el.isVisible(true)){