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

Roo/bootstrap/Modal.js
---

diff --git a/Roo/bootstrap/Modal.js b/Roo/bootstrap/Modal.js
index 472c23fc60..e1a89653f5 100644
--- a/Roo/bootstrap/Modal.js
+++ b/Roo/bootstrap/Modal.js
@@ -270,10 +270,9 @@ 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);
-            // var h = this.height || Roo.lib.Dom.getViewportHeight(true) - 60;
-            var view_height = Roo.lib.Dom.getViewportHeight(true) - 60;
+            var view_height = Roo.lib.Dom.getViewportHeight(true) - 60; //without padding
             
-            this.setSize(w, this.height || Roo.lib.Dom.getViewportHeight(true) - 60);
+            this.setSize(w, this.height || view_height);
             Roo.log(this.bodyEl.dom.offsetHeight);
             
             //