Roo/bootstrap/Modal.js

[roojs1] / Roo / bootstrap / Modal.js

diff --git a/Roo/bootstrap/Modal.js b/Roo/bootstrap/Modal.js
index 05a62ec..e39f801 100644 (file)
--- a/Roo/bootstrap/Modal.js
+++ b/Roo/bootstrap/Modal.js
@@ -85,7 +85,7 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
     
     max_width: 0,
     
-    fix_content: false,
+    fit_content: false,
 
     onRender : function(ct, position)
     {
@@ -261,19 +261,26 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
 
     resize : function()
     {
-        this.maskEl.setSize(Roo.lib.Dom.getViewWidth(true),  Roo.lib.Dom.getViewHeight(true));
+        this.maskEl.setSize(
+            Roo.lib.Dom.getViewWidth(true),
+            Roo.lib.Dom.getViewHeight(true)
+        );
         
         if (this.fitwindow) {
-            var w = this.width || Roo.lib.Dom.getViewportWidth(true) - 30;
-            var h = this.height || Roo.lib.Dom.getViewportHeight(true) - 60;
-            this.setSize(w,h);
+            this.setSize(
+                this.width || Roo.lib.Dom.getViewportWidth(true) - 30,
+                this.height || Roo.lib.Dom.getViewportHeight(true) - 60
+            );
+            return;
         }
         
-        if(!this.fitwindow && this.max_width !== 0){
+        if(this.max_width !== 0) {
             
-            var w = Math.min(this.max_width, Roo.lib.Dom.getViewportWidth(true) - 30);
+            var w = Math.min(
+                this.max_width,
+                Roo.lib.Dom.getViewportWidth(true) - 30
+            );
             
-            // for fix height
             if(this.height) {
                 this.setSize(w, this.height);
                 return;
@@ -281,19 +288,12 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
             
             if(!this.fit_content) {
                 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();
             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;
             }