From edf9b0f2d30c63960b5b0a36743a29c4c8e90581 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 9 May 2018 14:45:16 +0800 Subject: [PATCH] Roo/XComponent.js roojs-core.js roojs-core-debug.js --- Roo/XComponent.js | 6 +++--- roojs-core-debug.js | 6 +++--- roojs-core.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Roo/XComponent.js b/Roo/XComponent.js index fb4afa9ce2..aef018caac 100644 --- a/Roo/XComponent.js +++ b/Roo/XComponent.js @@ -691,16 +691,16 @@ Roo.apply(Roo.XComponent, { 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 + ' in'); Roo.log(component); } - }); + } }, diff --git a/roojs-core-debug.js b/roojs-core-debug.js index 3cb23ef1e4..fe6f489429 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -16602,16 +16602,16 @@ Roo.apply(Roo.XComponent, { 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 + ' in'); Roo.log(component); } - }); + } }, diff --git a/roojs-core.js b/roojs-core.js index 0a1c6a59bb..5523825f08 100644 --- a/roojs-core.js +++ b/roojs-core.js @@ -673,7 +673,7 @@ m.modules.each(D);}else{Roo.debug&&Roo.log("build Order: no child modules");}if( );Roo.MessageBox.show({title:"Please wait...",msg:C,width:450,progress:true,closable:false,modal:false});}var D=B.length;var E=this;var F=function(){if(!B.length){Roo.debug&&Roo.log('hide?');if(!this.hideProgress&&Roo.MessageBox){Roo.MessageBox.hide();}Roo.XComponent.build_from_html=false; Roo.XComponent.event.fireEvent('buildcomplete',E.topModule);return false;}var m=B.shift();Roo.debug&&Roo.log(m);if(typeof(m)=='function'){m.call(this);return F.defer(10,E);}C="Building Interface "+(D-B.length)+" of "+D+(m.name?(' - '+m.name):'');Roo.debug&&Roo.log(C); if(!E.hideProgress&&Roo.MessageBox){Roo.MessageBox.updateProgress((D-B.length)/D,C);}var G=(typeof(m.disabled)=='function')?m.disabled.call(m.module.disabled):m.disabled;if(G){return F();}m.render();return F.defer(10,E);};F.defer(1,E);},overlayStrings:function(A,B){if(typeof(A['_named_strings'])==undefined){throw "ERROR: component does not have _named_strings"; -}Roo.each(B,function(k,v){var md=typeof(A['_named_strings'][k])=='undefined'?false:A['_named_strings'][k];if(md!==false){A['strings'][md]=v;}else{Roo.log('could not find named string: '+k+' in');Roo.log(A);}});},event:false,on:false});Roo.XComponent.event=new Roo.util.Observable({events:{'register':true,'beforebuild':true,'buildcomplete':true} +}for(var k in B){var md=typeof(A['_named_strings'][k])=='undefined'?false:A['_named_strings'][k];if(md!==false){A['strings'][md]=B[k];}else{Roo.log('could not find named string: '+k+' in');Roo.log(A);}}},event:false,on:false});Roo.XComponent.event=new Roo.util.Observable({events:{'register':true,'beforebuild':true,'buildcomplete':true} });Roo.XComponent.on=Roo.XComponent.event.on.createDelegate(Roo.XComponent.event); // Roo/Markdown.js Roo.Markdown={};Roo.Markdown.toHtml=function(A){var c=new Roo.Markdown.marked.setOptions({renderer:new Roo.Markdown.marked.Renderer(),gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,smartLists:true,smartypants:false});A=A.replace(/\\\n/g,' '); -- 2.39.2