From: john <john@roojs.com>
Date: Wed, 26 Sep 2018 03:39:54 +0000 (+0800)
Subject: Roo/bootstrap/Modal.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=74ab0ce48db31420c84226407131e611e3dd379f

Roo/bootstrap/Modal.js
---

diff --git a/Roo/bootstrap/Modal.js b/Roo/bootstrap/Modal.js
index 7beb1135f5..f7741b590f 100644
--- a/Roo/bootstrap/Modal.js
+++ b/Roo/bootstrap/Modal.js
@@ -269,7 +269,14 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
         }
         
         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;
+            }
+            
             var view_height = Roo.lib.Dom.getViewportHeight(true) - 60;
             
             var body_childs = this.bodyEl.dom.childNodes;