projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of http://git.roojs.com/roojs1
[roojs1]
/
Roo
/
bootstrap
/
Modal.js
diff --git
a/Roo/bootstrap/Modal.js
b/Roo/bootstrap/Modal.js
index
8e426a9
..
ab945dd
100644
(file)
--- a/
Roo/bootstrap/Modal.js
+++ b/
Roo/bootstrap/Modal.js
@@
-299,9
+299,12
@@
Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component, {
);
if (this.fitwindow) {
);
if (this.fitwindow) {
+
+ var view_height = Roo.lib.Dom.getViewportHeight(true);
+
this.setSize(
this.width || Roo.lib.Dom.getViewportWidth(true) - 30,
this.setSize(
this.width || Roo.lib.Dom.getViewportWidth(true) - 30,
- this.height || Roo.lib.Dom.getViewportHeight(true)
- 6
0
+ this.height || Roo.lib.Dom.getViewportHeight(true)
// catering margin-top 30 margin-bottom 3
0
);
return;
}
);
return;
}
@@
-464,22
+467,18
@@
Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component, {
{
//this.el.select('.modal-footer').()
},
{
//this.el.select('.modal-footer').()
},
- diff : false,
resizeTo: function(w,h)
{
resizeTo: function(w,h)
{
- // skip.. ?? why??
-
this.dialogEl.setWidth(w);
this.dialogEl.setWidth(w);
- if (this.diff === false) {
- this.diff = this.dialogEl.getHeight() - this.bodyEl.getHeight();
- }
-
- this.bodyEl.setHeight(h - this.diff);
+
+ var diff = this.headerEl.getHeight() + this.footerEl.getHeight() + 30; // dialog margin-bottom: 30
+ this.bodyEl.setHeight(h - diff);
+
this.fireEvent('resize', this);
this.fireEvent('resize', this);
-
},
},
+
setContentSize : function(w, h)
{
setContentSize : function(w, h)
{