projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
59b40c6
)
Roo/Document.js
author
Alan Knowles
<alan@akbkhome.com>
Wed, 23 Jun 2010 05:55:20 +0000
(13:55 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Wed, 23 Jun 2010 05:55:20 +0000
(13:55 +0800)
Roo/Document.js
patch
|
blob
|
history
diff --git
a/Roo/Document.js
b/Roo/Document.js
index
ccdda11
..
6a8a8f5
100644
(file)
--- a/
Roo/Document.js
+++ b/
Roo/Document.js
@@
-306,21
+306,18
@@
Roo.apply(Roo.XComponent,
if (typeof(m) == 'function') {
m.call(this);
if (typeof(m) == 'function') {
m.call(this);
- progressRun.defer(10, _this);
- return;
+
return
progressRun.defer(10, _this);
+
}
var disabled = (typeof(m.module.disabled) == 'function') ?
}
var disabled = (typeof(m.module.disabled) == 'function') ?
- m.module.disabled.call(m.module.disabled) : m.module.disabled;
-
+ m.module.disabled.call(m.module.disabled) : m.module.disabled;
}
if (disabled) {
}
if (disabled) {
- return progressRun.defer(10, _this);
- }
- if (m.parent.layout && !disabled) {
- // modules have to support a 'add method'
- // should we just move that code into here..
- m.module.add(m.parent.layout, m.region);
+ return progressRun(); // we do not update the display!
}
}
+
+ this.el = m.parent.el.addxtype(m.items[0]);
+ this.panel = this.el;