X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FXComponent.js;h=06dc502eb2fb00214b7bd5259c5815b11edfe4e4;hb=61bc45258e16a779856dd2ad0862630b489e4583;hp=8f9fcf46dff0a9a3511e65299ad565cc706cb918;hpb=51c7ca4ebfc01acedf088a26c1c86324e6d77750;p=roojs1 diff --git a/Roo/XComponent.js b/Roo/XComponent.js index 8f9fcf46df..06dc502eb2 100644 --- a/Roo/XComponent.js +++ b/Roo/XComponent.js @@ -420,7 +420,7 @@ Roo.apply(Roo.XComponent, { break; default: - if (obj.disabled) { + if (obj.disabled || obj.region == '#disabled') { return; } break; @@ -613,6 +613,7 @@ Roo.apply(Roo.XComponent, { msg: msg, width:450, progress:true, + buttons : false, closable:false, modal: false @@ -688,18 +689,19 @@ Roo.apply(Roo.XComponent, { */ overlayStrings : function( component, strings ) { - if (typeof(component['_named_strings']) == undefined) { + if (typeof(component['_named_strings']) == 'undefined') { 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) { - component['strings'][md] = v; + component['_strings'][md] = strings[k]; } else { - Roo.log('could not find named string: ' + k) + Roo.log('could not find named string: ' + k + ' in'); + Roo.log(component); } - }); + } },