sync

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index b8c816b..70aaa9c 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -2839,11 +2839,22 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
             
             var w = Math.min(this.max_width, Roo.lib.Dom.getViewportWidth(true) - 30);
             
-            if(this.height) {
+            if(
+                this.height &&
+                this.height <= Roo.lib.Dom.getViewportHeight(true) - 60
+            ) {
                 this.setSize(w, this.height);
                 return;
             }
             
+            if(
+                this.height &&
+                this.height > Roo.lib.Dom.getViewportHeight(true) - 60
+            ) {
+                this.setSize(w, Roo.lib.Dom.getViewportHeight(true) - 60);
+                return;
+            }
+            
             if(!this.fit_content) {
                 this.setSize(w, Roo.lib.Dom.getViewportHeight(true) - 60);
                 return;