Roo/bootstrap/Modal.js

[roojs1] / Roo / bootstrap / Modal.js

diff --git a/Roo/bootstrap/Modal.js b/Roo/bootstrap/Modal.js
index f9d3196..7beb113 100644 (file)
--- a/Roo/bootstrap/Modal.js
+++ b/Roo/bootstrap/Modal.js
@@ -17,7 +17,7 @@
  * @cfg {Boolean} allow_close default true
  * @cfg {Boolean} fitwindow default false
  * @cfg {String} size (sm|lg) default empty
- * @cfg {Number} maxWidth set the maxWidth of modal
+ * @cfg {Number} max_width set the max width of modal
  *
  *
  * @constructor
@@ -82,6 +82,8 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
     closeEl:  false,
 
     size: '',
+    
+    max_width: 0,
 
 
     onRender : function(ct, position)
@@ -266,6 +268,31 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
             this.setSize(w,h);
         }
         
+        if(!this.fitwindow && this.max_width !== 0){
+            var w = Math.min(this.max_width, Roo.lib.Dom.getViewportWidth(true) - 30);
+            var view_height = Roo.lib.Dom.getViewportHeight(true) - 60;
+            
+            var body_childs = this.bodyEl.dom.childNodes;
+            var body_height = 0;
+            for(var i = 0; i < body_childs.length; i++) {
+                body_height += body_childs[i].offsetHeight;
+            }
+            
+            this.setSize(w, this.height || view_height);
+            
+            
+            
+            // 
+            // if(
+            //     (
+            //         this.headerEl.getHeight() + 
+            //         this.bodyEl.getHeight() + 
+            //         this.footerEl.getHeight()
+            //     ) > view_height) {
+            // } {
+            //     this.setSize(w,view_height);
+            // }
+        }
         
     },