projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
45cbe31
)
Roo/bootstrap/layout/Manager.js
author
Alan Knowles
<alan@roojs.com>
Thu, 13 Jul 2017 05:55:10 +0000
(13:55 +0800)
committer
Alan Knowles
<alan@roojs.com>
Thu, 13 Jul 2017 05:55:10 +0000
(13:55 +0800)
Roo/bootstrap/layout/Manager.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/layout/Manager.js
b/Roo/bootstrap/layout/Manager.js
index
85a0412
..
2411e77
100644
(file)
--- a/
Roo/bootstrap/layout/Manager.js
+++ b/
Roo/bootstrap/layout/Manager.js
@@
-19,17
+19,9
@@
Roo.bootstrap.layout.Manager = function(config)
Roo.bootstrap.layout.Manager.superclass.constructor.call(this);
Roo.bootstrap.layout.Manager.superclass.constructor.call(this);
+
- this.el = Roo.get(config.el);
- // ie scrollbar fix
- if(this.el.dom == document.body && Roo.isIE && !config.allowScroll){
- document.body.scroll = "no";
- }else if(this.el.dom != document.body && this.el.getStyle('position') == 'static'){
- this.el.position('relative');
- }
- this.id = this.el.id;
- this.el.addClass("roo-layout-container");
/** false to disable window resize monitoring @type Boolean */
this.monitorWindowResize = true;
this.regions = {};
/** false to disable window resize monitoring @type Boolean */
this.monitorWindowResize = true;
this.regions = {};
@@
-61,7
+53,8
@@
Roo.bootstrap.layout.Manager = function(config)
"regionexpanded" : true
});
this.updating = false;
"regionexpanded" : true
});
this.updating = false;
- if (this.el) {
+ if (config.el) {
+ this.el = Roo.get(config.el);
this.initEvents();
}
this.initEvents();
}
@@
-80,6
+73,16
@@
Roo.extend(Roo.bootstrap.layout.Manager, Roo.bootstrap.Component, {
initEvents: function()
{
initEvents: function()
{
+
+
+ // ie scrollbar fix
+ if(this.el.dom == document.body && Roo.isIE && !config.allowScroll){
+ document.body.scroll = "no";
+ }else if(this.el.dom != document.body && this.el.getStyle('position') == 'static'){
+ this.el.position('relative');
+ }
+ this.id = this.el.id;
+ this.el.addClass("roo-layout-container");
Roo.EventManager.onWindowResize(this.onWindowResize, this, true);
}
Roo.EventManager.onWindowResize(this.onWindowResize, this, true);
}