projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a8d0b5c
)
Roo/bootstrap/Modal.js
author
john
<john@roojs.com>
Wed, 26 Sep 2018 03:21:10 +0000
(11:21 +0800)
committer
john
<john@roojs.com>
Wed, 26 Sep 2018 03:21:10 +0000
(11:21 +0800)
Roo/bootstrap/Modal.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Modal.js
b/Roo/bootstrap/Modal.js
index
59ea3de
..
7b85926
100644
(file)
--- a/
Roo/bootstrap/Modal.js
+++ b/
Roo/bootstrap/Modal.js
@@
-270,8
+270,18
@@
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);
- var h = this.height || Roo.lib.Dom.getViewportHeight(true) - 60;
- this.setSize(w,h);
+ // var h = this.height || Roo.lib.Dom.getViewportHeight(true) - 60;
+ this.setSize(w,this.height);
+
+ if(
+ (
+ this.headerEl.getHeight() +
+ this.bodyEl.getHeight() +
+ this.footerEl.getHeight()
+ ) > Roo.lib.Dom.getViewportHeight(true) - 60) {
+ } {
+
+ }
}
},
}
},