From: john <john@roojs.com>
Date: Fri, 28 Sep 2018 04:28:26 +0000 (+0800)
Subject: roojs-bootstrap.js
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=5778e202817f56f75c6e5b6817f1962778fa21c5;p=roojs1

roojs-bootstrap.js
roojs-bootstrap-debug.js
---

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index f4050804f6..4f8308a0b2 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -2842,6 +2842,7 @@ 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;
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index aa2da3dcaa..790623fbcd 100644
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -113,8 +113,8 @@ for(var i=0;i<D.length;i++){C.push(this.addxtype(Roo.apply({},D[i])));}}this.ite
 ]}]}]}]};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);
-}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");
+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');
 this.el.select('.modal-dialog',true).first().setStyle('transform','');if(this.animate){this.el.addClass('hideing');(function(){if(!this.el.hasClass('hideing')){return;}this.el.removeClass('show');this.el.removeClass('hideing');}).defer(150,this);}else{this.el.removeClass('show');