From 8ceee5fcd2ea7397eca046977ec4a7927f8b59b6 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 7 Feb 2020 15:01:36 +0800 Subject: [PATCH] roojs-core.js roojs-core-debug.js roojs-all.js roojs-debug.js Roo/Markdown.js --- Roo/Markdown.js | 2 +- roojs-all.js | 96 ++++++++++++++++++++++----------------------- roojs-core-debug.js | 2 +- roojs-core.js | 96 ++++++++++++++++++++++----------------------- roojs-debug.js | 2 +- 5 files changed, 99 insertions(+), 99 deletions(-) diff --git a/Roo/Markdown.js b/Roo/Markdown.js index 49910e810d..7b76b4cfd4 100644 --- a/Roo/Markdown.js +++ b/Roo/Markdown.js @@ -1126,7 +1126,7 @@ Roo.Markdown.toHtml = function(text) { * Helpers */ - function escape(html, encode) { + var escape = function (html, encode) { return html .replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&') .replace(//)('closed',/<(tag)[\s\S]+?<\/\1>/)('closing',/])*?>/)(/tag/g,A._tag)(); A.paragraph=replace(A.paragraph)('hr',A.hr)('heading',A.heading)('lheading',A.lheading)('blockquote',A.blockquote)('tag','<'+A._tag)('def',A.def)();A.normal=merge({},A);A.gfm=merge({},A.normal,{fences:/^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\s*\1 *(?:\n+|$)/,paragraph:/^/,heading:/^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/} );A.gfm.paragraph=replace(A.paragraph)('(?!','(?!'+A.gfm.fences.source.replace('\\1','\\2')+'|'+A.list.source.replace('\\1','\\3')+'|')();A.tables=merge({},A.gfm,{nptable:/^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,table:/^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/} -);var B=function(F){this.tokens=[];this.tokens.links={};this.options=F||marked.defaults;this.rules=A.normal;if(this.options.gfm){if(this.options.tables){this.rules=A.tables;}else{this.rules=A.gfm;}}};B.rules=A;B.lex=function(F,G){var H=new B(G);return H.lex(F); -};B.prototype.lex=function(F){F=F.replace(/\r\n|\r/g,'\n').replace(/\t/g,' ').replace(/\u00a0/g,' ').replace(/\u2424/g,'\n');return this.token(F,true);};B.prototype.token=function(F,G,bq){var F=F.replace(/^ +$/gm,''),H,I,J,K,b,L,M,i,l;while(F){if(J=this.rules.newline.exec(F)){F=F.substring(J[0].length); -if(J[0].length>1){this.tokens.push({type:'space'});}}if(J=this.rules.code.exec(F)){F=F.substring(J[0].length);J=J[0].replace(/^ {4}/gm,'');this.tokens.push({type:'code',text:!this.options.pedantic?J.replace(/\n+$/,''):J});continue;}if(J=this.rules.fences.exec(F)){F=F.substring(J[0].length); -this.tokens.push({type:'code',lang:J[2],text:J[3]||''});continue;}if(J=this.rules.heading.exec(F)){F=F.substring(J[0].length);this.tokens.push({type:'heading',depth:J[1].length,text:J[2]});continue;}if(G&&(J=this.rules.nptable.exec(F))){F=F.substring(J[0].length); -L={type:'table',header:J[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:J[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:J[3].replace(/\n$/,'').split('\n')};for(i=0;i ?/gm,'');this.token(J,G,true); -this.tokens.push({type:'blockquote_end'});continue;}if(J=this.rules.list.exec(F)){F=F.substring(J[0].length);K=J[2];this.tokens.push({type:'list_start',ordered:K.length>1});J=J[0].match(this.rules.item);H=false;l=J.length;i=0;for(;i1&&b.length>1)){F=J.slice(i+1).join('\n')+F; -i=l-1;}}I=H||/\n\n(?!\s*$)/.test(L);if(i!==l-1){H=L.charAt(L.length-1)==='\n';if(!I){I=H;}}this.tokens.push({type:I?'loose_item_start':'list_item_start'});this.token(L,false,bq);this.tokens.push({type:'list_item_end'});}this.tokens.push({type:'list_end'}); -continue;}if(J=this.rules.html.exec(F)){F=F.substring(J[0].length);this.tokens.push({type:this.options.sanitize?'paragraph':'html',pre:!this.options.sanitizer&&(J[1]==='pre'||J[1]==='script'||J[1]==='style'),text:J[0]});continue;}if((!bq&&G)&&(J=this.rules.def.exec(F))){F=F.substring(J[0].length); -this.tokens.links[J[1].toLowerCase()]={href:J[2],title:J[3]};continue;}if(G&&(J=this.rules.table.exec(F))){F=F.substring(J[0].length);L={type:'table',header:J[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:J[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:J[3].replace(/(?: *\| *)?\n$/,'').split('\n')} -;for(i=0;i])/,autolink:/^<([^ >]+(@|:\/)[^ >]+)>/,url:noop,tag:/^|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,link:/^!?\[(inside)\]\(href\)/,reflink:/^!?\[(inside)\]\s*\[([^\]]*)\]/,nolink:/^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,strong:/^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,em:/^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:noop,text:/^[\s\S]+?(?=[\\1){this.tokens.push({type:'space'});}}if(K=this.rules.code.exec(G)){G=G.substring(K[0].length);K=K[0].replace(/^ {4}/gm,'');this.tokens.push({type:'code',text:!this.options.pedantic?K.replace(/\n+$/,''):K});continue;}if(K=this.rules.fences.exec(G)){G=G.substring(K[0].length); +this.tokens.push({type:'code',lang:K[2],text:K[3]||''});continue;}if(K=this.rules.heading.exec(G)){G=G.substring(K[0].length);this.tokens.push({type:'heading',depth:K[1].length,text:K[2]});continue;}if(H&&(K=this.rules.nptable.exec(G))){G=G.substring(K[0].length); +M={type:'table',header:K[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:K[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:K[3].replace(/\n$/,'').split('\n')};for(i=0;i ?/gm,'');this.token(K,H,true); +this.tokens.push({type:'blockquote_end'});continue;}if(K=this.rules.list.exec(G)){G=G.substring(K[0].length);L=K[2];this.tokens.push({type:'list_start',ordered:L.length>1});K=K[0].match(this.rules.item);I=false;l=K.length;i=0;for(;i1&&b.length>1)){G=K.slice(i+1).join('\n')+G; +i=l-1;}}J=I||/\n\n(?!\s*$)/.test(M);if(i!==l-1){I=M.charAt(M.length-1)==='\n';if(!J){J=I;}}this.tokens.push({type:J?'loose_item_start':'list_item_start'});this.token(M,false,bq);this.tokens.push({type:'list_item_end'});}this.tokens.push({type:'list_end'}); +continue;}if(K=this.rules.html.exec(G)){G=G.substring(K[0].length);this.tokens.push({type:this.options.sanitize?'paragraph':'html',pre:!this.options.sanitizer&&(K[1]==='pre'||K[1]==='script'||K[1]==='style'),text:K[0]});continue;}if((!bq&&H)&&(K=this.rules.def.exec(G))){G=G.substring(K[0].length); +this.tokens.links[K[1].toLowerCase()]={href:K[2],title:K[3]};continue;}if(H&&(K=this.rules.table.exec(G))){G=G.substring(K[0].length);M={type:'table',header:K[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:K[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:K[3].replace(/(?: *\| *)?\n$/,'').split('\n')} +;for(i=0;i])/,autolink:/^<([^ >]+(@|:\/)[^ >]+)>/,url:noop,tag:/^|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,link:/^!?\[(inside)\]\(href\)/,reflink:/^!?\[(inside)\]\s*\[([^\]]*)\]/,nolink:/^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,strong:/^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,em:/^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:noop,text:/^[\s\S]+?(?=[\\?(?:\s+['"]([\s\S]*?)['"])?\s*/;C.link=replace(C.link)('inside',C._inside)('href',C._href)();C.reflink=replace(C.reflink)('inside',C._inside)();C.normal=merge({},C);C.pedantic=merge({} ,C.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/});C.gfm=merge({},C.normal,{escape:replace(C.escape)('])','~|])')(),url:/^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:replace(C.text)(']|','~]|')('|','|https?://|')()} -);C.breaks=merge({},C.gfm,{br:replace(C.br)('{2,}','*')(),text:replace(C.gfm.text)('{2,}','*')()});var D=function(F,G){this.options=G||marked.defaults;this.links=F;this.rules=C.normal;this.renderer=this.options.renderer||new E;this.renderer.options=this.options; -if(!this.links){throw new Error('Tokens array requires a `links` property.');}if(this.options.gfm){if(this.options.breaks){this.rules=C.breaks;}else{this.rules=C.gfm;}}else if(this.options.pedantic){this.rules=C.pedantic;}};D.rules=C;D.output=function(F,G,H){var I=new D(G,H); -return I.output(F);};D.prototype.output=function(F){var G='',H,I,J,K;while(F){if(K=this.rules.escape.exec(F)){F=F.substring(K[0].length);G+=K[1];continue;}if(K=this.rules.autolink.exec(F)){F=F.substring(K[0].length);if(K[2]==='@'){I=K[1].charAt(6)===':'?this.mangle(K[1].substring(7)):this.mangle(K[1]); -J=this.mangle('mailto:')+I;}else{I=escape(K[1]);J=I;}G+=this.renderer.link(J,null,I);continue;}if(!this.inLink&&(K=this.rules.url.exec(F))){F=F.substring(K[0].length);I=escape(K[1]);J=I;G+=this.renderer.link(J,null,I);continue;}if(K=this.rules.tag.exec(F)){if(!this.inLink&&/^/i.test(K[0])){this.inLink=false;}F=F.substring(K[0].length);G+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(K[0]):escape(K[0]):K[0];continue;}if(K=this.rules.link.exec(F)){F=F.substring(K[0].length);this.inLink=true; -G+=this.outputLink(K,{href:K[2],title:K[3]});this.inLink=false;continue;}if((K=this.rules.reflink.exec(F))||(K=this.rules.nolink.exec(F))){F=F.substring(K[0].length);H=(K[2]||K[1]).replace(/\s+/g,' ');H=this.links[H.toLowerCase()];if(!H||!H.href){G+=K[0].charAt(0); -F=K[0].substring(1)+F;continue;}this.inLink=true;G+=this.outputLink(K,H);this.inLink=false;continue;}if(K=this.rules.strong.exec(F)){F=F.substring(K[0].length);G+=this.renderer.strong(this.output(K[2]||K[1]));continue;}if(K=this.rules.em.exec(F)){F=F.substring(K[0].length); -G+=this.renderer.em(this.output(K[2]||K[1]));continue;}if(K=this.rules.code.exec(F)){F=F.substring(K[0].length);G+=this.renderer.codespan(escape(K[2],true));continue;}if(K=this.rules.br.exec(F)){F=F.substring(K[0].length);G+=this.renderer.br();continue;}if(K=this.rules.del.exec(F)){F=F.substring(K[0].length); -G+=this.renderer.del(this.output(K[1]));continue;}if(K=this.rules.text.exec(F)){F=F.substring(K[0].length);G+=this.renderer.text(escape(this.smartypants(K[0])));continue;}if(F){throw new Error('Infinite loop on byte: '+F.charCodeAt(0));}}return G;};D.prototype.outputLink=function(F,G){var H=escape(G.href),I=G.title?escape(G.title):null; -return F[0].charAt(0)!=='!'?this.renderer.link(H,I,this.output(F[1])):this.renderer.image(H,I,escape(F[1]));};D.prototype.smartypants=function(F){if(!this.options.smartypants){return F;}return F.replace(/---/g,'\u2014').replace(/--/g,'\u2013').replace(/(^|[-\u2014/(\[{"\s])'/g,'$1\u2018').replace(/'/g,'\u2019').replace(/(^|[-\u2014/(\[{\u2018\s])"/g,'$1\u201c').replace(/"/g,'\u201d').replace(/\.{3}/g,'\u2026'); -};D.prototype.mangle=function(F){if(!this.options.mangle){return F;}var G='',l=F.length,i=0,ch;for(;i0.5){ch='x'+ch.toString(16);}G+='&#'+ch+';';}return G;};var E=function(F){this.options=F||{};};E.prototype.code=function(F,G,H){if(this.options.highlight){var I=this.options.highlight(F,G); -if(I!=null&&I!==F){H=true;F=I;}}else{H=true;}if(!G){return '
'+(H?F:escape(F,true))+'\n
';}return '
'+(H?F:escape(F,true))+'\n
\n';};E.prototype.blockquote=function(F){return '
\n'+F+'
\n'; -};E.prototype.html=function(F){return F;};E.prototype.heading=function(F,G,H){return ''+F+'\n';};E.prototype.hr=function(){return this.options.xhtml?'
\n':'
\n'; -};E.prototype.list=function(F,G){var H=G?'ol':'ul';return '<'+H+'>\n'+F+'\n';};E.prototype.listitem=function(F){return '
  • '+F+'
  • \n';};E.prototype.paragraph=function(F){return '

    '+F+'

    \n';};E.prototype.table=function(F,G){return '\n'+'\n'+F+'\n'+'\n'+G+'\n'+'
    \n'; -};E.prototype.tablerow=function(F){return '\n'+F+'\n';};E.prototype.tablecell=function(F,G){var H=G.header?'th':'td';var I=G.align?'<'+H+' style="text-align:'+G.align+'">':'<'+H+'>';return I+F+'\n';};E.prototype.strong=function(F){return ''+F+''; -};E.prototype.em=function(F){return ''+F+'';};E.prototype.codespan=function(F){return ''+F+'';};E.prototype.br=function(){return this.options.xhtml?'
    ':'
    ';};E.prototype.del=function(F){return ''+F+'';};E.prototype.link=function(F,G,H){if(this.options.sanitize){try{var I=decodeURIComponent(unescape(F)).replace(/[^\w:]/g,'').toLowerCase(); -}catch(e){return '';}if(I.indexOf('javascript:')===0||I.indexOf('vbscript:')===0){return '';}}var J='
    ';return J;};E.prototype.image=function(F,G,H){var I=''+H+'':'>';return I;};E.prototype.text=function(F){return F;};function Parser(F){this.tokens=[];this.token=null;this.options=F||marked.defaults;this.options.renderer=this.options.renderer||new E;this.renderer=this.options.renderer;this.renderer.options=this.options; -}Parser.parse=function(F,G,H){var I=new Parser(G,H);return I.parse(F);};Parser.prototype.parse=function(F){this.inline=new D(F.links,this.options,this.renderer);this.tokens=F.reverse();var G='';while(this.next()){G+=this.tok();}return G;};Parser.prototype.next=function(){return this.token=this.tokens.pop(); -};Parser.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0;};Parser.prototype.parseText=function(){var F=this.token.text;while(this.peek().type==='text'){F+='\n'+this.next().text;}return this.inline.output(F);};Parser.prototype.tok=function(){switch(this.token.type){case 'space':{return ''; -}case 'hr':{return this.renderer.hr();}case 'heading':{return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,this.token.text);}case 'code':{return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);}case 'table':{var F='',G='',i,H,I,J,j; -I='';for(i=0;i/g,'>').replace(/"/g,'"').replace(/'/g,'''); -}function unescape(F){return F.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g,function(_,n){n=n.toLowerCase();if(n==='colon'){return ':';}if(n.charAt(0)==='#'){return n.charAt(1)==='x'?String.fromCharCode(parseInt(n.substring(2),16)):String.fromCharCode(+n.substring(1)); -}return '';});}function replace(F,G){F=F.source;G=G||'';return function H(I,J){if(!I){return new RegExp(F,G);}J=J.source||J;J=J.replace(/(^|[^\[])\^/g,'$1');F=F.replace(I,J);return H;};}function noop(){}noop.exec=noop;function merge(F){var i=1,G,H;for(;iAn error occured:

    '+escape(e.message+'',true)+'
    ';}throw e;}}marked.options=marked.setOptions=function(F){merge(marked.defaults,F);return marked;};marked.defaults={gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,sanitizer:null,mangle:true,smartLists:false,silent:false,highlight:null,langPrefix:'lang-',smartypants:false,headerPrefix:'',renderer:new E,xhtml:false} -;marked.Parser=Parser;marked.parser=Parser.parse;marked.Renderer=E;marked.Lexer=B;marked.lexer=B.lex;marked.InlineLexer=D;marked.inlineLexer=D.output;marked.parse=marked;Roo.Markdown.marked=marked;})(); +);C.breaks=merge({},C.gfm,{br:replace(C.br)('{2,}','*')(),text:replace(C.gfm.text)('{2,}','*')()});var D=function(G,H){this.options=H||marked.defaults;this.links=G;this.rules=C.normal;this.renderer=this.options.renderer||new E;this.renderer.options=this.options; +if(!this.links){throw new Error('Tokens array requires a `links` property.');}if(this.options.gfm){if(this.options.breaks){this.rules=C.breaks;}else{this.rules=C.gfm;}}else if(this.options.pedantic){this.rules=C.pedantic;}};D.rules=C;D.output=function(G,H,I){var J=new D(H,I); +return J.output(G);};D.prototype.output=function(G){var H='',I,J,K,L;while(G){if(L=this.rules.escape.exec(G)){G=G.substring(L[0].length);H+=L[1];continue;}if(L=this.rules.autolink.exec(G)){G=G.substring(L[0].length);if(L[2]==='@'){J=L[1].charAt(6)===':'?this.mangle(L[1].substring(7)):this.mangle(L[1]); +K=this.mangle('mailto:')+J;}else{J=escape(L[1]);K=J;}H+=this.renderer.link(K,null,J);continue;}if(!this.inLink&&(L=this.rules.url.exec(G))){G=G.substring(L[0].length);J=escape(L[1]);K=J;H+=this.renderer.link(K,null,J);continue;}if(L=this.rules.tag.exec(G)){if(!this.inLink&&/^
    /i.test(L[0])){this.inLink=false;}G=G.substring(L[0].length);H+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(L[0]):escape(L[0]):L[0];continue;}if(L=this.rules.link.exec(G)){G=G.substring(L[0].length);this.inLink=true; +H+=this.outputLink(L,{href:L[2],title:L[3]});this.inLink=false;continue;}if((L=this.rules.reflink.exec(G))||(L=this.rules.nolink.exec(G))){G=G.substring(L[0].length);I=(L[2]||L[1]).replace(/\s+/g,' ');I=this.links[I.toLowerCase()];if(!I||!I.href){H+=L[0].charAt(0); +G=L[0].substring(1)+G;continue;}this.inLink=true;H+=this.outputLink(L,I);this.inLink=false;continue;}if(L=this.rules.strong.exec(G)){G=G.substring(L[0].length);H+=this.renderer.strong(this.output(L[2]||L[1]));continue;}if(L=this.rules.em.exec(G)){G=G.substring(L[0].length); +H+=this.renderer.em(this.output(L[2]||L[1]));continue;}if(L=this.rules.code.exec(G)){G=G.substring(L[0].length);H+=this.renderer.codespan(escape(L[2],true));continue;}if(L=this.rules.br.exec(G)){G=G.substring(L[0].length);H+=this.renderer.br();continue;}if(L=this.rules.del.exec(G)){G=G.substring(L[0].length); +H+=this.renderer.del(this.output(L[1]));continue;}if(L=this.rules.text.exec(G)){G=G.substring(L[0].length);H+=this.renderer.text(escape(this.smartypants(L[0])));continue;}if(G){throw new Error('Infinite loop on byte: '+G.charCodeAt(0));}}return H;};D.prototype.outputLink=function(G,H){var I=escape(H.href),J=H.title?escape(H.title):null; +return G[0].charAt(0)!=='!'?this.renderer.link(I,J,this.output(G[1])):this.renderer.image(I,J,escape(G[1]));};D.prototype.smartypants=function(G){if(!this.options.smartypants){return G;}return G.replace(/---/g,'\u2014').replace(/--/g,'\u2013').replace(/(^|[-\u2014/(\[{"\s])'/g,'$1\u2018').replace(/'/g,'\u2019').replace(/(^|[-\u2014/(\[{\u2018\s])"/g,'$1\u201c').replace(/"/g,'\u201d').replace(/\.{3}/g,'\u2026'); +};D.prototype.mangle=function(G){if(!this.options.mangle){return G;}var H='',l=G.length,i=0,ch;for(;i0.5){ch='x'+ch.toString(16);}H+='&#'+ch+';';}return H;};var E=function(G){this.options=G||{};};E.prototype.code=function(G,H,I){if(this.options.highlight){var J=this.options.highlight(G,H); +if(J!=null&&J!==G){I=true;G=J;}}else{I=true;}if(!H){return '
    '+(I?G:escape(G,true))+'\n
    ';}return '
    '+(I?G:escape(G,true))+'\n
    \n';};E.prototype.blockquote=function(G){return '
    \n'+G+'
    \n'; +};E.prototype.html=function(G){return G;};E.prototype.heading=function(G,H,I){return ''+G+'\n';};E.prototype.hr=function(){return this.options.xhtml?'
    \n':'
    \n'; +};E.prototype.list=function(G,H){var I=H?'ol':'ul';return '<'+I+'>\n'+G+'\n';};E.prototype.listitem=function(G){return '
  • '+G+'
  • \n';};E.prototype.paragraph=function(G){return '

    '+G+'

    \n';};E.prototype.table=function(G,H){return '\n'+'\n'+G+'\n'+'\n'+H+'\n'+'
    \n'; +};E.prototype.tablerow=function(G){return '\n'+G+'\n';};E.prototype.tablecell=function(G,H){var I=H.header?'th':'td';var J=H.align?'<'+I+' style="text-align:'+H.align+'">':'<'+I+'>';return J+G+'\n';};E.prototype.strong=function(G){return ''+G+''; +};E.prototype.em=function(G){return ''+G+'';};E.prototype.codespan=function(G){return ''+G+'';};E.prototype.br=function(){return this.options.xhtml?'
    ':'
    ';};E.prototype.del=function(G){return ''+G+'';};E.prototype.link=function(G,H,I){if(this.options.sanitize){try{var J=decodeURIComponent(unescape(G)).replace(/[^\w:]/g,'').toLowerCase(); +}catch(e){return '';}if(J.indexOf('javascript:')===0||J.indexOf('vbscript:')===0){return '';}}var K='
    ';return K;};E.prototype.image=function(G,H,I){var J=''+I+'':'>';return J;};E.prototype.text=function(G){return G;};var F=function(G){this.tokens=[];this.token=null;this.options=G||marked.defaults;this.options.renderer=this.options.renderer||new E;this.renderer=this.options.renderer;this.renderer.options=this.options; +};F.parse=function(G,H,I){var J=new F(H,I);return J.parse(G);};F.prototype.parse=function(G){this.inline=new D(G.links,this.options,this.renderer);this.tokens=G.reverse();var H='';while(this.next()){H+=this.tok();}return H;};F.prototype.next=function(){return this.token=this.tokens.pop(); +};F.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0;};F.prototype.parseText=function(){var G=this.token.text;while(this.peek().type==='text'){G+='\n'+this.next().text;}return this.inline.output(G);};F.prototype.tok=function(){switch(this.token.type){case 'space':{return ''; +}case 'hr':{return this.renderer.hr();}case 'heading':{return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,this.token.text);}case 'code':{return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);}case 'table':{var G='',H='',i,I,J,K,j; +J='';for(i=0;i/g,'>').replace(/"/g,'"').replace(/'/g,'''); +}function unescape(G){return G.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g,function(_,n){n=n.toLowerCase();if(n==='colon'){return ':';}if(n.charAt(0)==='#'){return n.charAt(1)==='x'?String.fromCharCode(parseInt(n.substring(2),16)):String.fromCharCode(+n.substring(1)); +}return '';});}function replace(G,H){G=G.source;H=H||'';return function I(J,K){if(!J){return new RegExp(G,H);}K=K.source||K;K=K.replace(/(^|[^\[])\^/g,'$1');G=G.replace(J,K);return I;};}function noop(){}noop.exec=noop;function merge(G){var i=1,H,I;for(;iAn error occured:

    '+escape(e.message+'',true)+'
    ';}throw e;}}marked.options=marked.setOptions=function(G){merge(marked.defaults,G);return marked;};marked.defaults={gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,sanitizer:null,mangle:true,smartLists:false,silent:false,highlight:null,langPrefix:'lang-',smartypants:false,headerPrefix:'',renderer:new E,xhtml:false} +;marked.Parser=F;marked.parser=F.parse;marked.Renderer=E;marked.Lexer=B;marked.lexer=B.lex;marked.InlineLexer=D;marked.inlineLexer=D.output;marked.parse=marked;Roo.Markdown.marked=marked;})(); // Roo/dd/DragDrop.js (function(){var A=Roo.EventManager;var B=Roo.lib.Dom;Roo.dd.DragDrop=function(id,C,D){if(id){this.init(id,C,D);}};Roo.extend(Roo.dd.DragDrop,Roo.util.Observable,{id:null,config:null,dragElId:null,handleElId:null,invalidHandleTypes:null,invalidHandleIds:null,invalidHandleClasses:null,startPageX:0,startPageY:0,groups:null,locked:false,lock:function(){this.locked=true; },unlock:function(){this.locked=false;},isTarget:true,padding:null,_domRef:null,__ygDragDrop:true,constrainX:false,constrainY:false,minX:0,maxX:0,minY:0,maxY:0,maintainOffset:false,xTicks:null,yTicks:null,primaryButtonOnly:true,available:false,hasOuterHandles:false,b4StartDrag:function(x,y){} diff --git a/roojs-core-debug.js b/roojs-core-debug.js index 30edece245..5fe012b525 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -17706,7 +17706,7 @@ Roo.Markdown.toHtml = function(text) { * Parsing & Compiling */ - function Parser(options) { + var Parser= function (options) { this.tokens = []; this.token = null; this.options = options || marked.defaults; diff --git a/roojs-core.js b/roojs-core.js index a71159b302..5ccb0cb563 100644 --- a/roojs-core.js +++ b/roojs-core.js @@ -688,56 +688,56 @@ return Roo.Markdown.marked(A);};(function(){var A={newline:/^\n+/,code:/^( {4}[^ A._tag='(?!(?:'+'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'+'|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'+'|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b';A.html=replace(A.html)('comment',//)('closed',/<(tag)[\s\S]+?<\/\1>/)('closing',/])*?>/)(/tag/g,A._tag)(); A.paragraph=replace(A.paragraph)('hr',A.hr)('heading',A.heading)('lheading',A.lheading)('blockquote',A.blockquote)('tag','<'+A._tag)('def',A.def)();A.normal=merge({},A);A.gfm=merge({},A.normal,{fences:/^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\s*\1 *(?:\n+|$)/,paragraph:/^/,heading:/^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/} );A.gfm.paragraph=replace(A.paragraph)('(?!','(?!'+A.gfm.fences.source.replace('\\1','\\2')+'|'+A.list.source.replace('\\1','\\3')+'|')();A.tables=merge({},A.gfm,{nptable:/^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,table:/^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/} -);var B=function(F){this.tokens=[];this.tokens.links={};this.options=F||marked.defaults;this.rules=A.normal;if(this.options.gfm){if(this.options.tables){this.rules=A.tables;}else{this.rules=A.gfm;}}};B.rules=A;B.lex=function(F,G){var H=new B(G);return H.lex(F); -};B.prototype.lex=function(F){F=F.replace(/\r\n|\r/g,'\n').replace(/\t/g,' ').replace(/\u00a0/g,' ').replace(/\u2424/g,'\n');return this.token(F,true);};B.prototype.token=function(F,G,bq){var F=F.replace(/^ +$/gm,''),H,I,J,K,b,L,M,i,l;while(F){if(J=this.rules.newline.exec(F)){F=F.substring(J[0].length); -if(J[0].length>1){this.tokens.push({type:'space'});}}if(J=this.rules.code.exec(F)){F=F.substring(J[0].length);J=J[0].replace(/^ {4}/gm,'');this.tokens.push({type:'code',text:!this.options.pedantic?J.replace(/\n+$/,''):J});continue;}if(J=this.rules.fences.exec(F)){F=F.substring(J[0].length); -this.tokens.push({type:'code',lang:J[2],text:J[3]||''});continue;}if(J=this.rules.heading.exec(F)){F=F.substring(J[0].length);this.tokens.push({type:'heading',depth:J[1].length,text:J[2]});continue;}if(G&&(J=this.rules.nptable.exec(F))){F=F.substring(J[0].length); -L={type:'table',header:J[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:J[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:J[3].replace(/\n$/,'').split('\n')};for(i=0;i ?/gm,'');this.token(J,G,true); -this.tokens.push({type:'blockquote_end'});continue;}if(J=this.rules.list.exec(F)){F=F.substring(J[0].length);K=J[2];this.tokens.push({type:'list_start',ordered:K.length>1});J=J[0].match(this.rules.item);H=false;l=J.length;i=0;for(;i1&&b.length>1)){F=J.slice(i+1).join('\n')+F; -i=l-1;}}I=H||/\n\n(?!\s*$)/.test(L);if(i!==l-1){H=L.charAt(L.length-1)==='\n';if(!I){I=H;}}this.tokens.push({type:I?'loose_item_start':'list_item_start'});this.token(L,false,bq);this.tokens.push({type:'list_item_end'});}this.tokens.push({type:'list_end'}); -continue;}if(J=this.rules.html.exec(F)){F=F.substring(J[0].length);this.tokens.push({type:this.options.sanitize?'paragraph':'html',pre:!this.options.sanitizer&&(J[1]==='pre'||J[1]==='script'||J[1]==='style'),text:J[0]});continue;}if((!bq&&G)&&(J=this.rules.def.exec(F))){F=F.substring(J[0].length); -this.tokens.links[J[1].toLowerCase()]={href:J[2],title:J[3]};continue;}if(G&&(J=this.rules.table.exec(F))){F=F.substring(J[0].length);L={type:'table',header:J[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:J[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:J[3].replace(/(?: *\| *)?\n$/,'').split('\n')} -;for(i=0;i])/,autolink:/^<([^ >]+(@|:\/)[^ >]+)>/,url:noop,tag:/^|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,link:/^!?\[(inside)\]\(href\)/,reflink:/^!?\[(inside)\]\s*\[([^\]]*)\]/,nolink:/^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,strong:/^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,em:/^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:noop,text:/^[\s\S]+?(?=[\\1){this.tokens.push({type:'space'});}}if(K=this.rules.code.exec(G)){G=G.substring(K[0].length);K=K[0].replace(/^ {4}/gm,'');this.tokens.push({type:'code',text:!this.options.pedantic?K.replace(/\n+$/,''):K});continue;}if(K=this.rules.fences.exec(G)){G=G.substring(K[0].length); +this.tokens.push({type:'code',lang:K[2],text:K[3]||''});continue;}if(K=this.rules.heading.exec(G)){G=G.substring(K[0].length);this.tokens.push({type:'heading',depth:K[1].length,text:K[2]});continue;}if(H&&(K=this.rules.nptable.exec(G))){G=G.substring(K[0].length); +M={type:'table',header:K[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:K[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:K[3].replace(/\n$/,'').split('\n')};for(i=0;i ?/gm,'');this.token(K,H,true); +this.tokens.push({type:'blockquote_end'});continue;}if(K=this.rules.list.exec(G)){G=G.substring(K[0].length);L=K[2];this.tokens.push({type:'list_start',ordered:L.length>1});K=K[0].match(this.rules.item);I=false;l=K.length;i=0;for(;i1&&b.length>1)){G=K.slice(i+1).join('\n')+G; +i=l-1;}}J=I||/\n\n(?!\s*$)/.test(M);if(i!==l-1){I=M.charAt(M.length-1)==='\n';if(!J){J=I;}}this.tokens.push({type:J?'loose_item_start':'list_item_start'});this.token(M,false,bq);this.tokens.push({type:'list_item_end'});}this.tokens.push({type:'list_end'}); +continue;}if(K=this.rules.html.exec(G)){G=G.substring(K[0].length);this.tokens.push({type:this.options.sanitize?'paragraph':'html',pre:!this.options.sanitizer&&(K[1]==='pre'||K[1]==='script'||K[1]==='style'),text:K[0]});continue;}if((!bq&&H)&&(K=this.rules.def.exec(G))){G=G.substring(K[0].length); +this.tokens.links[K[1].toLowerCase()]={href:K[2],title:K[3]};continue;}if(H&&(K=this.rules.table.exec(G))){G=G.substring(K[0].length);M={type:'table',header:K[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:K[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:K[3].replace(/(?: *\| *)?\n$/,'').split('\n')} +;for(i=0;i])/,autolink:/^<([^ >]+(@|:\/)[^ >]+)>/,url:noop,tag:/^|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,link:/^!?\[(inside)\]\(href\)/,reflink:/^!?\[(inside)\]\s*\[([^\]]*)\]/,nolink:/^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,strong:/^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,em:/^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:noop,text:/^[\s\S]+?(?=[\\?(?:\s+['"]([\s\S]*?)['"])?\s*/;C.link=replace(C.link)('inside',C._inside)('href',C._href)();C.reflink=replace(C.reflink)('inside',C._inside)();C.normal=merge({},C);C.pedantic=merge({} ,C.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/});C.gfm=merge({},C.normal,{escape:replace(C.escape)('])','~|])')(),url:/^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:replace(C.text)(']|','~]|')('|','|https?://|')()} -);C.breaks=merge({},C.gfm,{br:replace(C.br)('{2,}','*')(),text:replace(C.gfm.text)('{2,}','*')()});var D=function(F,G){this.options=G||marked.defaults;this.links=F;this.rules=C.normal;this.renderer=this.options.renderer||new E;this.renderer.options=this.options; -if(!this.links){throw new Error('Tokens array requires a `links` property.');}if(this.options.gfm){if(this.options.breaks){this.rules=C.breaks;}else{this.rules=C.gfm;}}else if(this.options.pedantic){this.rules=C.pedantic;}};D.rules=C;D.output=function(F,G,H){var I=new D(G,H); -return I.output(F);};D.prototype.output=function(F){var G='',H,I,J,K;while(F){if(K=this.rules.escape.exec(F)){F=F.substring(K[0].length);G+=K[1];continue;}if(K=this.rules.autolink.exec(F)){F=F.substring(K[0].length);if(K[2]==='@'){I=K[1].charAt(6)===':'?this.mangle(K[1].substring(7)):this.mangle(K[1]); -J=this.mangle('mailto:')+I;}else{I=escape(K[1]);J=I;}G+=this.renderer.link(J,null,I);continue;}if(!this.inLink&&(K=this.rules.url.exec(F))){F=F.substring(K[0].length);I=escape(K[1]);J=I;G+=this.renderer.link(J,null,I);continue;}if(K=this.rules.tag.exec(F)){if(!this.inLink&&/^
    /i.test(K[0])){this.inLink=false;}F=F.substring(K[0].length);G+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(K[0]):escape(K[0]):K[0];continue;}if(K=this.rules.link.exec(F)){F=F.substring(K[0].length);this.inLink=true; -G+=this.outputLink(K,{href:K[2],title:K[3]});this.inLink=false;continue;}if((K=this.rules.reflink.exec(F))||(K=this.rules.nolink.exec(F))){F=F.substring(K[0].length);H=(K[2]||K[1]).replace(/\s+/g,' ');H=this.links[H.toLowerCase()];if(!H||!H.href){G+=K[0].charAt(0); -F=K[0].substring(1)+F;continue;}this.inLink=true;G+=this.outputLink(K,H);this.inLink=false;continue;}if(K=this.rules.strong.exec(F)){F=F.substring(K[0].length);G+=this.renderer.strong(this.output(K[2]||K[1]));continue;}if(K=this.rules.em.exec(F)){F=F.substring(K[0].length); -G+=this.renderer.em(this.output(K[2]||K[1]));continue;}if(K=this.rules.code.exec(F)){F=F.substring(K[0].length);G+=this.renderer.codespan(escape(K[2],true));continue;}if(K=this.rules.br.exec(F)){F=F.substring(K[0].length);G+=this.renderer.br();continue;}if(K=this.rules.del.exec(F)){F=F.substring(K[0].length); -G+=this.renderer.del(this.output(K[1]));continue;}if(K=this.rules.text.exec(F)){F=F.substring(K[0].length);G+=this.renderer.text(escape(this.smartypants(K[0])));continue;}if(F){throw new Error('Infinite loop on byte: '+F.charCodeAt(0));}}return G;};D.prototype.outputLink=function(F,G){var H=escape(G.href),I=G.title?escape(G.title):null; -return F[0].charAt(0)!=='!'?this.renderer.link(H,I,this.output(F[1])):this.renderer.image(H,I,escape(F[1]));};D.prototype.smartypants=function(F){if(!this.options.smartypants){return F;}return F.replace(/---/g,'\u2014').replace(/--/g,'\u2013').replace(/(^|[-\u2014/(\[{"\s])'/g,'$1\u2018').replace(/'/g,'\u2019').replace(/(^|[-\u2014/(\[{\u2018\s])"/g,'$1\u201c').replace(/"/g,'\u201d').replace(/\.{3}/g,'\u2026'); -};D.prototype.mangle=function(F){if(!this.options.mangle){return F;}var G='',l=F.length,i=0,ch;for(;i0.5){ch='x'+ch.toString(16);}G+='&#'+ch+';';}return G;};var E=function(F){this.options=F||{};};E.prototype.code=function(F,G,H){if(this.options.highlight){var I=this.options.highlight(F,G); -if(I!=null&&I!==F){H=true;F=I;}}else{H=true;}if(!G){return '
    '+(H?F:escape(F,true))+'\n
    ';}return '
    '+(H?F:escape(F,true))+'\n
    \n';};E.prototype.blockquote=function(F){return '
    \n'+F+'
    \n'; -};E.prototype.html=function(F){return F;};E.prototype.heading=function(F,G,H){return ''+F+'\n';};E.prototype.hr=function(){return this.options.xhtml?'
    \n':'
    \n'; -};E.prototype.list=function(F,G){var H=G?'ol':'ul';return '<'+H+'>\n'+F+'\n';};E.prototype.listitem=function(F){return '
  • '+F+'
  • \n';};E.prototype.paragraph=function(F){return '

    '+F+'

    \n';};E.prototype.table=function(F,G){return '\n'+'\n'+F+'\n'+'\n'+G+'\n'+'
    \n'; -};E.prototype.tablerow=function(F){return '\n'+F+'\n';};E.prototype.tablecell=function(F,G){var H=G.header?'th':'td';var I=G.align?'<'+H+' style="text-align:'+G.align+'">':'<'+H+'>';return I+F+'\n';};E.prototype.strong=function(F){return ''+F+''; -};E.prototype.em=function(F){return ''+F+'';};E.prototype.codespan=function(F){return ''+F+'';};E.prototype.br=function(){return this.options.xhtml?'
    ':'
    ';};E.prototype.del=function(F){return ''+F+'';};E.prototype.link=function(F,G,H){if(this.options.sanitize){try{var I=decodeURIComponent(unescape(F)).replace(/[^\w:]/g,'').toLowerCase(); -}catch(e){return '';}if(I.indexOf('javascript:')===0||I.indexOf('vbscript:')===0){return '';}}var J='
    ';return J;};E.prototype.image=function(F,G,H){var I=''+H+'':'>';return I;};E.prototype.text=function(F){return F;};function Parser(F){this.tokens=[];this.token=null;this.options=F||marked.defaults;this.options.renderer=this.options.renderer||new E;this.renderer=this.options.renderer;this.renderer.options=this.options; -}Parser.parse=function(F,G,H){var I=new Parser(G,H);return I.parse(F);};Parser.prototype.parse=function(F){this.inline=new D(F.links,this.options,this.renderer);this.tokens=F.reverse();var G='';while(this.next()){G+=this.tok();}return G;};Parser.prototype.next=function(){return this.token=this.tokens.pop(); -};Parser.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0;};Parser.prototype.parseText=function(){var F=this.token.text;while(this.peek().type==='text'){F+='\n'+this.next().text;}return this.inline.output(F);};Parser.prototype.tok=function(){switch(this.token.type){case 'space':{return ''; -}case 'hr':{return this.renderer.hr();}case 'heading':{return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,this.token.text);}case 'code':{return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);}case 'table':{var F='',G='',i,H,I,J,j; -I='';for(i=0;i/g,'>').replace(/"/g,'"').replace(/'/g,'''); -}function unescape(F){return F.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g,function(_,n){n=n.toLowerCase();if(n==='colon'){return ':';}if(n.charAt(0)==='#'){return n.charAt(1)==='x'?String.fromCharCode(parseInt(n.substring(2),16)):String.fromCharCode(+n.substring(1)); -}return '';});}function replace(F,G){F=F.source;G=G||'';return function H(I,J){if(!I){return new RegExp(F,G);}J=J.source||J;J=J.replace(/(^|[^\[])\^/g,'$1');F=F.replace(I,J);return H;};}function noop(){}noop.exec=noop;function merge(F){var i=1,G,H;for(;iAn error occured:

    '+escape(e.message+'',true)+'
    ';}throw e;}}marked.options=marked.setOptions=function(F){merge(marked.defaults,F);return marked;};marked.defaults={gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,sanitizer:null,mangle:true,smartLists:false,silent:false,highlight:null,langPrefix:'lang-',smartypants:false,headerPrefix:'',renderer:new E,xhtml:false} -;marked.Parser=Parser;marked.parser=Parser.parse;marked.Renderer=E;marked.Lexer=B;marked.lexer=B.lex;marked.InlineLexer=D;marked.inlineLexer=D.output;marked.parse=marked;Roo.Markdown.marked=marked;})(); +);C.breaks=merge({},C.gfm,{br:replace(C.br)('{2,}','*')(),text:replace(C.gfm.text)('{2,}','*')()});var D=function(G,H){this.options=H||marked.defaults;this.links=G;this.rules=C.normal;this.renderer=this.options.renderer||new E;this.renderer.options=this.options; +if(!this.links){throw new Error('Tokens array requires a `links` property.');}if(this.options.gfm){if(this.options.breaks){this.rules=C.breaks;}else{this.rules=C.gfm;}}else if(this.options.pedantic){this.rules=C.pedantic;}};D.rules=C;D.output=function(G,H,I){var J=new D(H,I); +return J.output(G);};D.prototype.output=function(G){var H='',I,J,K,L;while(G){if(L=this.rules.escape.exec(G)){G=G.substring(L[0].length);H+=L[1];continue;}if(L=this.rules.autolink.exec(G)){G=G.substring(L[0].length);if(L[2]==='@'){J=L[1].charAt(6)===':'?this.mangle(L[1].substring(7)):this.mangle(L[1]); +K=this.mangle('mailto:')+J;}else{J=escape(L[1]);K=J;}H+=this.renderer.link(K,null,J);continue;}if(!this.inLink&&(L=this.rules.url.exec(G))){G=G.substring(L[0].length);J=escape(L[1]);K=J;H+=this.renderer.link(K,null,J);continue;}if(L=this.rules.tag.exec(G)){if(!this.inLink&&/^
    /i.test(L[0])){this.inLink=false;}G=G.substring(L[0].length);H+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(L[0]):escape(L[0]):L[0];continue;}if(L=this.rules.link.exec(G)){G=G.substring(L[0].length);this.inLink=true; +H+=this.outputLink(L,{href:L[2],title:L[3]});this.inLink=false;continue;}if((L=this.rules.reflink.exec(G))||(L=this.rules.nolink.exec(G))){G=G.substring(L[0].length);I=(L[2]||L[1]).replace(/\s+/g,' ');I=this.links[I.toLowerCase()];if(!I||!I.href){H+=L[0].charAt(0); +G=L[0].substring(1)+G;continue;}this.inLink=true;H+=this.outputLink(L,I);this.inLink=false;continue;}if(L=this.rules.strong.exec(G)){G=G.substring(L[0].length);H+=this.renderer.strong(this.output(L[2]||L[1]));continue;}if(L=this.rules.em.exec(G)){G=G.substring(L[0].length); +H+=this.renderer.em(this.output(L[2]||L[1]));continue;}if(L=this.rules.code.exec(G)){G=G.substring(L[0].length);H+=this.renderer.codespan(escape(L[2],true));continue;}if(L=this.rules.br.exec(G)){G=G.substring(L[0].length);H+=this.renderer.br();continue;}if(L=this.rules.del.exec(G)){G=G.substring(L[0].length); +H+=this.renderer.del(this.output(L[1]));continue;}if(L=this.rules.text.exec(G)){G=G.substring(L[0].length);H+=this.renderer.text(escape(this.smartypants(L[0])));continue;}if(G){throw new Error('Infinite loop on byte: '+G.charCodeAt(0));}}return H;};D.prototype.outputLink=function(G,H){var I=escape(H.href),J=H.title?escape(H.title):null; +return G[0].charAt(0)!=='!'?this.renderer.link(I,J,this.output(G[1])):this.renderer.image(I,J,escape(G[1]));};D.prototype.smartypants=function(G){if(!this.options.smartypants){return G;}return G.replace(/---/g,'\u2014').replace(/--/g,'\u2013').replace(/(^|[-\u2014/(\[{"\s])'/g,'$1\u2018').replace(/'/g,'\u2019').replace(/(^|[-\u2014/(\[{\u2018\s])"/g,'$1\u201c').replace(/"/g,'\u201d').replace(/\.{3}/g,'\u2026'); +};D.prototype.mangle=function(G){if(!this.options.mangle){return G;}var H='',l=G.length,i=0,ch;for(;i0.5){ch='x'+ch.toString(16);}H+='&#'+ch+';';}return H;};var E=function(G){this.options=G||{};};E.prototype.code=function(G,H,I){if(this.options.highlight){var J=this.options.highlight(G,H); +if(J!=null&&J!==G){I=true;G=J;}}else{I=true;}if(!H){return '
    '+(I?G:escape(G,true))+'\n
    ';}return '
    '+(I?G:escape(G,true))+'\n
    \n';};E.prototype.blockquote=function(G){return '
    \n'+G+'
    \n'; +};E.prototype.html=function(G){return G;};E.prototype.heading=function(G,H,I){return ''+G+'\n';};E.prototype.hr=function(){return this.options.xhtml?'
    \n':'
    \n'; +};E.prototype.list=function(G,H){var I=H?'ol':'ul';return '<'+I+'>\n'+G+'\n';};E.prototype.listitem=function(G){return '
  • '+G+'
  • \n';};E.prototype.paragraph=function(G){return '

    '+G+'

    \n';};E.prototype.table=function(G,H){return '\n'+'\n'+G+'\n'+'\n'+H+'\n'+'
    \n'; +};E.prototype.tablerow=function(G){return '\n'+G+'\n';};E.prototype.tablecell=function(G,H){var I=H.header?'th':'td';var J=H.align?'<'+I+' style="text-align:'+H.align+'">':'<'+I+'>';return J+G+'\n';};E.prototype.strong=function(G){return ''+G+''; +};E.prototype.em=function(G){return ''+G+'';};E.prototype.codespan=function(G){return ''+G+'';};E.prototype.br=function(){return this.options.xhtml?'
    ':'
    ';};E.prototype.del=function(G){return ''+G+'';};E.prototype.link=function(G,H,I){if(this.options.sanitize){try{var J=decodeURIComponent(unescape(G)).replace(/[^\w:]/g,'').toLowerCase(); +}catch(e){return '';}if(J.indexOf('javascript:')===0||J.indexOf('vbscript:')===0){return '';}}var K='
    ';return K;};E.prototype.image=function(G,H,I){var J=''+I+'':'>';return J;};E.prototype.text=function(G){return G;};var F=function(G){this.tokens=[];this.token=null;this.options=G||marked.defaults;this.options.renderer=this.options.renderer||new E;this.renderer=this.options.renderer;this.renderer.options=this.options; +};F.parse=function(G,H,I){var J=new F(H,I);return J.parse(G);};F.prototype.parse=function(G){this.inline=new D(G.links,this.options,this.renderer);this.tokens=G.reverse();var H='';while(this.next()){H+=this.tok();}return H;};F.prototype.next=function(){return this.token=this.tokens.pop(); +};F.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0;};F.prototype.parseText=function(){var G=this.token.text;while(this.peek().type==='text'){G+='\n'+this.next().text;}return this.inline.output(G);};F.prototype.tok=function(){switch(this.token.type){case 'space':{return ''; +}case 'hr':{return this.renderer.hr();}case 'heading':{return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,this.token.text);}case 'code':{return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);}case 'table':{var G='',H='',i,I,J,K,j; +J='';for(i=0;i/g,'>').replace(/"/g,'"').replace(/'/g,'''); +}function unescape(G){return G.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g,function(_,n){n=n.toLowerCase();if(n==='colon'){return ':';}if(n.charAt(0)==='#'){return n.charAt(1)==='x'?String.fromCharCode(parseInt(n.substring(2),16)):String.fromCharCode(+n.substring(1)); +}return '';});}function replace(G,H){G=G.source;H=H||'';return function I(J,K){if(!J){return new RegExp(G,H);}K=K.source||K;K=K.replace(/(^|[^\[])\^/g,'$1');G=G.replace(J,K);return I;};}function noop(){}noop.exec=noop;function merge(G){var i=1,H,I;for(;iAn error occured:

    '+escape(e.message+'',true)+'
    ';}throw e;}}marked.options=marked.setOptions=function(G){merge(marked.defaults,G);return marked;};marked.defaults={gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,sanitizer:null,mangle:true,smartLists:false,silent:false,highlight:null,langPrefix:'lang-',smartypants:false,headerPrefix:'',renderer:new E,xhtml:false} +;marked.Parser=F;marked.parser=F.parse;marked.Renderer=E;marked.Lexer=B;marked.lexer=B.lex;marked.InlineLexer=D;marked.inlineLexer=D.output;marked.parse=marked;Roo.Markdown.marked=marked;})(); // Roo/dd/DragDrop.js (function(){var A=Roo.EventManager;var B=Roo.lib.Dom;Roo.dd.DragDrop=function(id,C,D){if(id){this.init(id,C,D);}};Roo.extend(Roo.dd.DragDrop,Roo.util.Observable,{id:null,config:null,dragElId:null,handleElId:null,invalidHandleTypes:null,invalidHandleIds:null,invalidHandleClasses:null,startPageX:0,startPageY:0,groups:null,locked:false,lock:function(){this.locked=true; },unlock:function(){this.locked=false;},isTarget:true,padding:null,_domRef:null,__ygDragDrop:true,constrainX:false,constrainY:false,minX:0,maxX:0,minY:0,maxY:0,maintainOffset:false,xTicks:null,yTicks:null,primaryButtonOnly:true,available:false,hasOuterHandles:false,b4StartDrag:function(x,y){} diff --git a/roojs-debug.js b/roojs-debug.js index c686fb71ed..4bd6823ab6 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -17706,7 +17706,7 @@ Roo.Markdown.toHtml = function(text) { * Parsing & Compiling */ - function Parser(options) { + var Parser= function (options) { this.tokens = []; this.token = null; this.options = options || marked.defaults; -- 2.39.2