projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ec8c18b
)
Roo/bootstrap/Modal.js
author
john
<john@roojs.com>
Wed, 26 Sep 2018 03:39:54 +0000
(11:39 +0800)
committer
john
<john@roojs.com>
Wed, 26 Sep 2018 03:39:54 +0000
(11:39 +0800)
Roo/bootstrap/Modal.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Modal.js
b/Roo/bootstrap/Modal.js
index
7beb113
..
f7741b5
100644
(file)
--- a/
Roo/bootstrap/Modal.js
+++ b/
Roo/bootstrap/Modal.js
@@
-269,7
+269,14
@@
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.height) {
+ this.setSize(w, this.height);
+ return;
+ }
+
var view_height = Roo.lib.Dom.getViewportHeight(true) - 60;
var body_childs = this.bodyEl.dom.childNodes;