projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1ddba07
)
Roo/bootstrap/Modal.js
author
Alan Knowles
<alan@roojs.com>
Sun, 9 Dec 2018 00:40:26 +0000
(08:40 +0800)
committer
Alan Knowles
<alan@roojs.com>
Sun, 9 Dec 2018 00:40:26 +0000
(08:40 +0800)
Roo/bootstrap/Modal.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Modal.js
b/Roo/bootstrap/Modal.js
index
3fbb25f
..
aad6c94
100644
(file)
--- a/
Roo/bootstrap/Modal.js
+++ b/
Roo/bootstrap/Modal.js
@@
-296,8
+296,7
@@
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.height || Roo.lib.Dom.getViewportHeight(true) // catering margin-top 30 margin-bottom 30
this.setSize(
this.width || Roo.lib.Dom.getViewportWidth(true) - 30,
this.height || Roo.lib.Dom.getViewportHeight(true) // catering margin-top 30 margin-bottom 30
@@
-361,7
+360,7
@@
Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component, {
Roo.get(document.body).addClass('modal-open');
if(this.animate){ // element has 'fade' - so stuff happens after .3s ?- not sure why the delay?
Roo.get(document.body).addClass('modal-open');
if(this.animate){ // element has 'fade' - so stuff happens after .3s ?- not sure why the delay?
- var _this = this;
+
(function(){
this.el.addClass('show');
this.el.addClass('in');
(function(){
this.el.addClass('show');
this.el.addClass('in');