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