projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4521292
)
Roo/Document.js
author
Alan Knowles
<alan@akbkhome.com>
Wed, 23 Jun 2010 05:07:47 +0000
(13:07 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Wed, 23 Jun 2010 05:07:47 +0000
(13:07 +0800)
Roo/Document.js
patch
|
blob
|
history
diff --git
a/Roo/Document.js
b/Roo/Document.js
index
d750049
..
cb50e4d
100644
(file)
--- a/
Roo/Document.js
+++ b/
Roo/Document.js
@@
-98,7
+98,7
@@
Roo.extend(Roo.Document, Roo.util.Observable, {
module : 'Pman.Tab.projectMgr',
region : 'center',
parent : 'Pman.layout',
module : 'Pman.Tab.projectMgr',
region : 'center',
parent : 'Pman.layout',
- disabled : false,
+ disabled : false,
// or use a function..
})
*
*/
})
*
*/
@@
-216,8
+216,16
@@
Roo.extend(Roo.Document, Roo.util.Observable, {
modal: false
});
modal: false
});
- var n = 0;
+ var n = -1;
+ var _this = this;
var progressRun = function() {
var progressRun = function() {
+ n++;
+ if (n >= mods.length) {
+ if (onComplete) {
+ onComplete.call(this);
+ }
+ return;
+ }
var m = mods[n];
var m = mods[n];
@@
-230,25
+238,22
@@
Roo.extend(Roo.Document, Roo.util.Observable, {
if (typeof(m) == 'function') {
m.call(this);
if (typeof(m) == 'function') {
m.call(this);
-
- } else {
- if (m.parent.layout && !m.module.disabled) {
- m.module.add(m.parent.layout, m.region);
- }
+ progressRun.defer(10, _this);
+ return;
+ }
+ var disabled = (typeof(m.module.disabled) == 'function') ?
+ m.module.disabled.call(m.module.disabled) : m.module.disabled;
}
}
-
- n++;
- if (n >= mods.length) {
- onComplete();
- return;
+ if (m.parent.layout && !disabled) {
+ m.module.add(m.parent.layout, m.region);
}
}
-
+
+
- progressRun.defer(10, Pman);
}
}
- progressRun.defer(1,
Pman
);
+ progressRun.defer(1,
_this
);