projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
47a7f6b
)
Roo/bootstrap/Modal.js
author
john
<john@roojs.com>
Wed, 26 Sep 2018 03:45:35 +0000
(11:45 +0800)
committer
john
<john@roojs.com>
Wed, 26 Sep 2018 03:45:35 +0000
(11:45 +0800)
Roo/bootstrap/Modal.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Modal.js
b/Roo/bootstrap/Modal.js
index
989bd9e
..
c2dc2fb
100644
(file)
--- a/
Roo/bootstrap/Modal.js
+++ b/
Roo/bootstrap/Modal.js
@@
-279,13
+279,13
@@
Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component, {
var view_height = Roo.lib.Dom.getViewportHeight(true) - 60;
var body_childs = this.bodyEl.dom.childNodes;
var view_height = Roo.lib.Dom.getViewportHeight(true) - 60;
var body_childs = this.bodyEl.dom.childNodes;
- var
body
_height = 0;
+ var
full
_height = 0;
for(var i = 0; i < body_childs.length; i++) {
for(var i = 0; i < body_childs.length; i++) {
-
body
_height += body_childs[i].offsetHeight;
+
full
_height += body_childs[i].offsetHeight;
}
if(body_height + this.headerEl.getHeight() + this.footerEl.getHeight() > view_height) {
}
if(body_height + this.headerEl.getHeight() + this.footerEl.getHeight() > view_height) {
- this.setSize(w,
this.height || view_height
);
+ this.setSize(w,
Math.min
);
}
}
}
}