projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
06a785a
)
Roo/bootstrap/Modal.js
author
john
<john@roojs.com>
Fri, 28 Sep 2018 03:57:23 +0000
(11:57 +0800)
committer
john
<john@roojs.com>
Fri, 28 Sep 2018 03:57:23 +0000
(11:57 +0800)
Roo/bootstrap/Modal.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Modal.js
b/Roo/bootstrap/Modal.js
index
74e2e3c
..
7d40f7b
100644
(file)
--- a/
Roo/bootstrap/Modal.js
+++ b/
Roo/bootstrap/Modal.js
@@
-271,7
+271,7
@@
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.fitwindow && this.max_width !== 0){
var w = Math.min(this.max_width, Roo.lib.Dom.getViewportWidth(true) - 30);
- this.setSize(w, this.height || Roo.lib.Dom.getViewportHeight(true) - 60);
+
// for fix height
if(this.height) {
this.setSize(w, this.height);
// for fix height
if(this.height) {
this.setSize(w, this.height);