projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try and get ctrl-enter to add a clear all
[roojs1]
/
Roo
/
XComponent.js
diff --git
a/Roo/XComponent.js
b/Roo/XComponent.js
index
8f9fcf4
..
06dc502
100644
(file)
--- a/
Roo/XComponent.js
+++ b/
Roo/XComponent.js
@@
-420,7
+420,7
@@
Roo.apply(Roo.XComponent, {
break;
default:
break;
default:
- if (obj.disabled) {
+ if (obj.disabled
|| obj.region == '#disabled'
) {
return;
}
break;
return;
}
break;
@@
-613,6
+613,7
@@
Roo.apply(Roo.XComponent, {
msg: msg,
width:450,
progress:true,
msg: msg,
width:450,
progress:true,
+ buttons : false,
closable:false,
modal: false
closable:false,
modal: false
@@
-688,18
+689,19
@@
Roo.apply(Roo.XComponent, {
*/
overlayStrings : function( component, strings )
{
*/
overlayStrings : function( component, strings )
{
- if (typeof(component['_named_strings']) ==
undefined
) {
+ if (typeof(component['_named_strings']) ==
'undefined'
) {
throw "ERROR: component does not have _named_strings";
}
throw "ERROR: component does not have _named_strings";
}
-
Roo.each(strings, function(k,v
) {
+
for ( var k in strings
) {
var md = typeof(component['_named_strings'][k]) == 'undefined' ? false : component['_named_strings'][k];
if (md !== false) {
var md = typeof(component['_named_strings'][k]) == 'undefined' ? false : component['_named_strings'][k];
if (md !== false) {
- component['
strings'][md] = v
;
+ component['
_strings'][md] = strings[k]
;
} else {
} else {
- Roo.log('could not find named string: ' + k)
+ Roo.log('could not find named string: ' + k + ' in');
+ Roo.log(component);
}
}
- }
);
+ }
},
},