From 1b8fba282f071406e9b21af949415953bda9553b Mon Sep 17 00:00:00 2001
From: john <john@roojs.com>
Date: Fri, 28 Sep 2018 12:32:23 +0800
Subject: [PATCH] sync

---
 Roo/bootstrap/Modal.js   | 2 +-
 roojs-bootstrap-debug.js | 4 ++--
 roojs-bootstrap.js       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Roo/bootstrap/Modal.js b/Roo/bootstrap/Modal.js
index ff85a6698a..b45a4fee77 100644
--- a/Roo/bootstrap/Modal.js
+++ b/Roo/bootstrap/Modal.js
@@ -270,7 +270,7 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
             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);
             
diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 62ece514aa..2c229bb24d 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -2837,10 +2837,12 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
             // 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;
             }
@@ -2859,8 +2861,6 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
                 full_height += body_childs[i].offsetHeight;
             }
             
-            Roo.log(full_height);
-            
             this.setSize(w, Math.min(full_height, Roo.lib.Dom.getViewportHeight(true) - 60));
         }
         
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 9a361c0ab0..9f3dce347a 100644
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -112,8 +112,8 @@ for(var i=0;i<D.length;i++){C.push(this.addxtype(Roo.apply({},D[i])));}}this.ite
 };var C=[];if(this.allow_close){C.push({tag:'button',cls:'close',html:'&times'});}C.push(B);var D='';if(this.size.length){D='modal-'+this.size;}var E={cls:"modal",cn:[{cls:"modal-dialog "+D,cn:[{cls:"modal-content",cn:[{cls:'modal-header',cn:C},A,{cls:'modal-footer',cn:[{tag:'div',cls:'btn-'+this.buttonPosition}
 ]}]}]}]};if(this.animate){E.cls+=' fade';}return E;},getChildContainer:function(){return this.bodyEl;},getButtonContainer:function(){return this.el.select('.modal-footer div',true).first();},initEvents:function(){if(this.allow_close){this.closeEl.on('click',this.hide,this);
 }Roo.EventManager.onWindowResize(this.resize,this,true);},resize:function(){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);}if(!this.fitwindow&&this.max_width!==0){var w=Math.min(this.max_width,Roo.lib.Dom.getViewportWidth(true)-30);if(this.height){this.setSize(w,this.height);return;}if(!this.fit_content){this.setSize(w,Roo.lib.Dom.getViewportHeight(true)-60);
-return;}var A=this.bodyEl.dom.childNodes;var B=this.headerEl.getHeight()+this.footerEl.getHeight();for(var i=0;i<A.length;i++){B+=A[i].offsetHeight;}Roo.log(B);this.setSize(w,Math.min(B,Roo.lib.Dom.getViewportHeight(true)-60));}},setSize:function(w,h){if(!w&&!h){return;
+this.setSize(w,h);}if(!this.fitwindow&&this.max_width!==0){var w=Math.min(this.max_width,Roo.lib.Dom.getViewportWidth(true)-30);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 A=this.bodyEl.dom.childNodes;var B=this.headerEl.getHeight()+this.footerEl.getHeight();for(var i=0;i<A.length;i++){B+=A[i].offsetHeight;}this.setSize(w,Math.min(B,Roo.lib.Dom.getViewportHeight(true)-60));}},setSize:function(w,h){if(!w&&!h){return;
 }this.resizeTo(w,h);},show:function(){if(!this.rendered){this.render();}this.el.removeClass('hideing');this.el.addClass('show');if(this.animate){var A=this;(function(){this.el.addClass('in');}).defer(50,this);}else{this.el.addClass('in');}Roo.get(document.body).addClass("x-body-masked");
 this.maskEl.setSize(Roo.lib.Dom.getViewWidth(true),Roo.lib.Dom.getViewHeight(true));this.maskEl.setStyle('z-index',Roo.bootstrap.Modal.zIndex++);this.maskEl.addClass('show');this.resize();this.fireEvent('show',this);this.el.setStyle('z-index',Roo.bootstrap.Modal.zIndex++);
 (function(){this.items.forEach(function(e){e.layout?e.layout():false;});}).defer(100,this);},hide:function(){if(this.fireEvent("beforehide",this)!==false){this.maskEl.removeClass('show');Roo.get(document.body).removeClass("x-body-masked");this.el.removeClass('in');
-- 
2.39.2