From: Alan Knowles <alan@roojs.com>
Date: Fri, 25 Nov 2016 07:00:39 +0000 (+0800)
Subject: Roo/bootstrap/Modal.js
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=ebcaa4f0158b5996e1fa29ded2750ffcccafce4d;p=roojs1

Roo/bootstrap/Modal.js
roojs-bootstrap.js
roojs-bootstrap-debug.js
---

diff --git a/Roo/bootstrap/Modal.js b/Roo/bootstrap/Modal.js
index bcc305bbfa..795ed3af29 100644
--- a/Roo/bootstrap/Modal.js
+++ b/Roo/bootstrap/Modal.js
@@ -328,7 +328,7 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
             this.diff = this.el.select('.modal-dialog',true).first().getHeight() - this.el.select('.modal-body',true).first().getHeight();
         }
         
-        this.el.select('.modal-body',true).first().setWidth(h-this.diff);
+        this.el.select('.modal-body',true).first().setHeight(h-this.diff);
         
         
     },
diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 2e352ae30e..955f84f5f3 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -2711,7 +2711,7 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
             this.diff = this.el.select('.modal-dialog',true).first().getHeight() - this.el.select('.modal-body',true).first().getHeight();
         }
         
-        this.el.select('.modal-body',true).first().setWidth(h-this.diff);
+        this.el.select('.modal-body',true).first().setHeight(h-this.diff);
         
         
     },
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 206c0e285b..19f9c8110d 100644
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -107,7 +107,7 @@ if(!this.el){var B=Roo.apply({},this.getAutoCreate());B.id=Roo.id();if(this.cls)
 this.maskEl.show();this.el.setStyle('zIndex','10001');this.fireEvent('show',this);},hide:function(){this.maskEl.hide();Roo.get(document.body).removeClass("x-body-masked");this.el.removeClass('in');this.el.select('.modal-dialog',true).first().setStyle('transform','');
 if(this.animate){var A=this;(function(){A.el.setStyle('display','none');}).defer(150);}else{this.el.setStyle('display','none');}this.fireEvent('hide',this);},addButton:function(A,cb){var b=Roo.apply({},{html:A});b.xns=b.xns||Roo.bootstrap;b.xtype=b.xtype||'Button';
 if(typeof(b.listeners)=='undefined'){b.listeners={click:cb.createDelegate(this)};}var B=Roo.factory(b);B.onRender(this.el.select('.modal-footer div').first());return B;},setDefaultButton:function(A){},diff:false,resizeTo:function(w,h){this.el.select('.modal-dialog',true).first().setWidth(w);
-if(this.diff===false){this.diff=this.el.select('.modal-dialog',true).first().getHeight()-this.el.select('.modal-body',true).first().getHeight();}this.el.select('.modal-body',true).first().setWidth(h-this.diff);},setContentSize:function(w,h){},onButtonClick:function(A,e){this.fireEvent('btnclick',A.name,e);
+if(this.diff===false){this.diff=this.el.select('.modal-dialog',true).first().getHeight()-this.el.select('.modal-body',true).first().getHeight();}this.el.select('.modal-body',true).first().setHeight(h-this.diff);},setContentSize:function(w,h){},onButtonClick:function(A,e){this.fireEvent('btnclick',A.name,e);
 },setTitle:function(A){this.titleEl.dom.innerHTML=A;},setBody:function(A){this.bodyEl.dom.innerHTML=A;},applyBody:function(A){if(!this.tmpl){Roo.log("Error - using apply Body without a template");}this.tmpl.overwrite(this.bodyEl,A);}});Roo.apply(Roo.bootstrap.Modal,{OK:[{name:'ok',weight:'primary',html:'OK'}
 ],YESNO:[{name:'no',html:'No'},{name:'yes',weight:'primary',html:'Yes'}],OKCANCEL:[{name:'cancel',html:'Cancel'},{name:'ok',weight:'primary',html:'OK'}],YESNOCANCEL:[{name:'yes',weight:'primary',html:'Yes'},{name:'no',html:'No'},{name:'cancel',html:'Cancel'}
 ]});