From c8a96293dde3056f89fee34282adb05a35dba08c Mon Sep 17 00:00:00 2001 From: john Date: Thu, 24 May 2018 17:19:38 +0800 Subject: [PATCH] Roo/XComponent.js roojs-core.js roojs-core-debug.js --- Roo/XComponent.js | 4 ++++ roojs-core-debug.js | 4 ++++ roojs-core.js | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Roo/XComponent.js b/Roo/XComponent.js index aeb257bf48..7194a440b8 100644 --- a/Roo/XComponent.js +++ b/Roo/XComponent.js @@ -688,6 +688,10 @@ Roo.apply(Roo.XComponent, { */ overlayStrings : function( component, strings ) { + if(typeof(component) == 'undefined') { + throw "ERROR: component undefined"; + } + if (typeof(component['_named_strings']) == 'undefined') { throw "ERROR: component does not have _named_strings"; } diff --git a/roojs-core-debug.js b/roojs-core-debug.js index 85f064d9ab..eefc151b4c 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -16634,6 +16634,10 @@ Roo.apply(Roo.XComponent, { */ overlayStrings : function( component, strings ) { + if(typeof(component) == 'undefined') { + throw "ERROR: component undefined"; + } + if (typeof(component['_named_strings']) == 'undefined') { throw "ERROR: component does not have _named_strings"; } diff --git a/roojs-core.js b/roojs-core.js index 52413fbfd2..e0e5e8f255 100644 --- a/roojs-core.js +++ b/roojs-core.js @@ -673,9 +673,9 @@ m.modules.each(D);}else{Roo.debug&&Roo.log("build Order: no child modules");}if( }return C;},build:function(A){if(typeof(A)!='undefined'){Roo.apply(this,A);}this.preBuild();var B=this.buildOrder();if(!B.length){throw "NO modules!!!";}var C="Building Interface...";if(!this.hideProgress&&Roo.MessageBox){Roo.MessageBox.show({title:'loading'} );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"; -}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); +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)=='undefined'){throw "ERROR: component undefined"; +}if(typeof(A['_named_strings'])=='undefined'){throw "ERROR: component does not have _named_strings";}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,' '); return Roo.Markdown.marked(A);};(function(){var A={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:noop,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:noop,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,def:/^ *\[([^\]]+)\]: *]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:noop,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/} -- 2.39.2