From 6d789997301ffd212f4fc6391df43ddf9268253b Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 7 Feb 2020 15:01:08 +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 | 98 ++++++++++++++++++++++----------------------- roojs-core-debug.js | 2 +- roojs-core.js | 98 ++++++++++++++++++++++----------------------- roojs-debug.js | 2 +- 5 files changed, 101 insertions(+), 101 deletions(-) diff --git a/Roo/Markdown.js b/Roo/Markdown.js index 1982c7a816..71e4c47424 100644 --- a/Roo/Markdown.js +++ b/Roo/Markdown.js @@ -796,7 +796,7 @@ Roo.Markdown.toHtml = function(text) { * Renderer */ - function Renderer(options) { + var Renderer = function (options) { this.options = options || {}; } diff --git a/roojs-all.js b/roojs-all.js index b4c5ecfcc6..f774cab2f8 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -688,57 +688,57 @@ 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(D){this.tokens=[];this.tokens.links={};this.options=D||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(D,E){var F=new B(E);return F.lex(D); -};B.prototype.lex=function(D){D=D.replace(/\r\n|\r/g,'\n').replace(/\t/g,' ').replace(/\u00a0/g,' ').replace(/\u2424/g,'\n');return this.token(D,true);};B.prototype.token=function(D,E,bq){var D=D.replace(/^ +$/gm,''),F,G,H,I,b,J,K,i,l;while(D){if(H=this.rules.newline.exec(D)){D=D.substring(H[0].length); -if(H[0].length>1){this.tokens.push({type:'space'});}}if(H=this.rules.code.exec(D)){D=D.substring(H[0].length);H=H[0].replace(/^ {4}/gm,'');this.tokens.push({type:'code',text:!this.options.pedantic?H.replace(/\n+$/,''):H});continue;}if(H=this.rules.fences.exec(D)){D=D.substring(H[0].length); -this.tokens.push({type:'code',lang:H[2],text:H[3]||''});continue;}if(H=this.rules.heading.exec(D)){D=D.substring(H[0].length);this.tokens.push({type:'heading',depth:H[1].length,text:H[2]});continue;}if(E&&(H=this.rules.nptable.exec(D))){D=D.substring(H[0].length); -J={type:'table',header:H[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:H[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:H[3].replace(/\n$/,'').split('\n')};for(i=0;i ?/gm,'');this.token(H,E,true); -this.tokens.push({type:'blockquote_end'});continue;}if(H=this.rules.list.exec(D)){D=D.substring(H[0].length);I=H[2];this.tokens.push({type:'list_start',ordered:I.length>1});H=H[0].match(this.rules.item);F=false;l=H.length;i=0;for(;i1&&b.length>1)){D=H.slice(i+1).join('\n')+D; -i=l-1;}}G=F||/\n\n(?!\s*$)/.test(J);if(i!==l-1){F=J.charAt(J.length-1)==='\n';if(!G){G=F;}}this.tokens.push({type:G?'loose_item_start':'list_item_start'});this.token(J,false,bq);this.tokens.push({type:'list_item_end'});}this.tokens.push({type:'list_end'}); -continue;}if(H=this.rules.html.exec(D)){D=D.substring(H[0].length);this.tokens.push({type:this.options.sanitize?'paragraph':'html',pre:!this.options.sanitizer&&(H[1]==='pre'||H[1]==='script'||H[1]==='style'),text:H[0]});continue;}if((!bq&&E)&&(H=this.rules.def.exec(D))){D=D.substring(H[0].length); -this.tokens.links[H[1].toLowerCase()]={href:H[2],title:H[3]};continue;}if(E&&(H=this.rules.table.exec(D))){D=D.substring(H[0].length);J={type:'table',header:H[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:H[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:H[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(I=this.rules.code.exec(E)){E=E.substring(I[0].length);I=I[0].replace(/^ {4}/gm,'');this.tokens.push({type:'code',text:!this.options.pedantic?I.replace(/\n+$/,''):I});continue;}if(I=this.rules.fences.exec(E)){E=E.substring(I[0].length); +this.tokens.push({type:'code',lang:I[2],text:I[3]||''});continue;}if(I=this.rules.heading.exec(E)){E=E.substring(I[0].length);this.tokens.push({type:'heading',depth:I[1].length,text:I[2]});continue;}if(F&&(I=this.rules.nptable.exec(E))){E=E.substring(I[0].length); +K={type:'table',header:I[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:I[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:I[3].replace(/\n$/,'').split('\n')};for(i=0;i ?/gm,'');this.token(I,F,true); +this.tokens.push({type:'blockquote_end'});continue;}if(I=this.rules.list.exec(E)){E=E.substring(I[0].length);J=I[2];this.tokens.push({type:'list_start',ordered:J.length>1});I=I[0].match(this.rules.item);G=false;l=I.length;i=0;for(;i1&&b.length>1)){E=I.slice(i+1).join('\n')+E; +i=l-1;}}H=G||/\n\n(?!\s*$)/.test(K);if(i!==l-1){G=K.charAt(K.length-1)==='\n';if(!H){H=G;}}this.tokens.push({type:H?'loose_item_start':'list_item_start'});this.token(K,false,bq);this.tokens.push({type:'list_item_end'});}this.tokens.push({type:'list_end'}); +continue;}if(I=this.rules.html.exec(E)){E=E.substring(I[0].length);this.tokens.push({type:this.options.sanitize?'paragraph':'html',pre:!this.options.sanitizer&&(I[1]==='pre'||I[1]==='script'||I[1]==='style'),text:I[0]});continue;}if((!bq&&F)&&(I=this.rules.def.exec(E))){E=E.substring(I[0].length); +this.tokens.links[I[1].toLowerCase()]={href:I[2],title:I[3]};continue;}if(F&&(I=this.rules.table.exec(E))){E=E.substring(I[0].length);K={type:'table',header:I[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:I[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:I[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,}','*')()});function InlineLexer(D,E){this.options=E||marked.defaults;this.links=D;this.rules=C.normal;this.renderer=this.options.renderer||new Renderer;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;}}InlineLexer.rules=C;InlineLexer.output=function(D,E,F){var G=new InlineLexer(E,F); -return G.output(D);};InlineLexer.prototype.output=function(D){var E='',F,G,H,I;while(D){if(I=this.rules.escape.exec(D)){D=D.substring(I[0].length);E+=I[1];continue;}if(I=this.rules.autolink.exec(D)){D=D.substring(I[0].length);if(I[2]==='@'){G=I[1].charAt(6)===':'?this.mangle(I[1].substring(7)):this.mangle(I[1]); -H=this.mangle('mailto:')+G;}else{G=escape(I[1]);H=G;}E+=this.renderer.link(H,null,G);continue;}if(!this.inLink&&(I=this.rules.url.exec(D))){D=D.substring(I[0].length);G=escape(I[1]);H=G;E+=this.renderer.link(H,null,G);continue;}if(I=this.rules.tag.exec(D)){if(!this.inLink&&/^/i.test(I[0])){this.inLink=false;}D=D.substring(I[0].length);E+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(I[0]):escape(I[0]):I[0];continue;}if(I=this.rules.link.exec(D)){D=D.substring(I[0].length);this.inLink=true; -E+=this.outputLink(I,{href:I[2],title:I[3]});this.inLink=false;continue;}if((I=this.rules.reflink.exec(D))||(I=this.rules.nolink.exec(D))){D=D.substring(I[0].length);F=(I[2]||I[1]).replace(/\s+/g,' ');F=this.links[F.toLowerCase()];if(!F||!F.href){E+=I[0].charAt(0); -D=I[0].substring(1)+D;continue;}this.inLink=true;E+=this.outputLink(I,F);this.inLink=false;continue;}if(I=this.rules.strong.exec(D)){D=D.substring(I[0].length);E+=this.renderer.strong(this.output(I[2]||I[1]));continue;}if(I=this.rules.em.exec(D)){D=D.substring(I[0].length); -E+=this.renderer.em(this.output(I[2]||I[1]));continue;}if(I=this.rules.code.exec(D)){D=D.substring(I[0].length);E+=this.renderer.codespan(escape(I[2],true));continue;}if(I=this.rules.br.exec(D)){D=D.substring(I[0].length);E+=this.renderer.br();continue;}if(I=this.rules.del.exec(D)){D=D.substring(I[0].length); -E+=this.renderer.del(this.output(I[1]));continue;}if(I=this.rules.text.exec(D)){D=D.substring(I[0].length);E+=this.renderer.text(escape(this.smartypants(I[0])));continue;}if(D){throw new Error('Infinite loop on byte: '+D.charCodeAt(0));}}return E;};InlineLexer.prototype.outputLink=function(D,E){var F=escape(E.href),G=E.title?escape(E.title):null; -return D[0].charAt(0)!=='!'?this.renderer.link(F,G,this.output(D[1])):this.renderer.image(F,G,escape(D[1]));};InlineLexer.prototype.smartypants=function(D){if(!this.options.smartypants){return D;}return D.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'); -};InlineLexer.prototype.mangle=function(D){if(!this.options.mangle){return D;}var E='',l=D.length,i=0,ch;for(;i0.5){ch='x'+ch.toString(16);}E+='&#'+ch+';';}return E;};function Renderer(D){this.options=D||{};}Renderer.prototype.code=function(D,E,F){if(this.options.highlight){var G=this.options.highlight(D,E); -if(G!=null&&G!==D){F=true;D=G;}}else{F=true;}if(!E){return '
'+(F?D:escape(D,true))+'\n
';}return '
'+(F?D:escape(D,true))+'\n
\n';};Renderer.prototype.blockquote=function(D){return '
\n'+D+'
\n'; -};Renderer.prototype.html=function(D){return D;};Renderer.prototype.heading=function(D,E,F){return ''+D+'\n';};Renderer.prototype.hr=function(){return this.options.xhtml?'
\n':'
\n'; -};Renderer.prototype.list=function(D,E){var F=E?'ol':'ul';return '<'+F+'>\n'+D+'\n';};Renderer.prototype.listitem=function(D){return '
  • '+D+'
  • \n';};Renderer.prototype.paragraph=function(D){return '

    '+D+'

    \n';};Renderer.prototype.table=function(D,E){return '\n'+'\n'+D+'\n'+'\n'+E+'\n'+'
    \n'; -};Renderer.prototype.tablerow=function(D){return '\n'+D+'\n';};Renderer.prototype.tablecell=function(D,E){var F=E.header?'th':'td';var G=E.align?'<'+F+' style="text-align:'+E.align+'">':'<'+F+'>';return G+D+'\n';};Renderer.prototype.strong=function(D){return ''+D+''; -};Renderer.prototype.em=function(D){return ''+D+'';};Renderer.prototype.codespan=function(D){return ''+D+'';};Renderer.prototype.br=function(){return this.options.xhtml?'
    ':'
    ';};Renderer.prototype.del=function(D){return ''+D+''; -};Renderer.prototype.link=function(D,E,F){if(this.options.sanitize){try{var G=decodeURIComponent(unescape(D)).replace(/[^\w:]/g,'').toLowerCase();}catch(e){return '';}if(G.indexOf('javascript:')===0||G.indexOf('vbscript:')===0){return '';}}var H='
    ';return H;};Renderer.prototype.image=function(D,E,F){var G=''+F+'':'>';return G;};Renderer.prototype.text=function(D){return D;};function Parser(D){this.tokens=[]; -this.token=null;this.options=D||marked.defaults;this.options.renderer=this.options.renderer||new Renderer;this.renderer=this.options.renderer;this.renderer.options=this.options;}Parser.parse=function(D,E,F){var G=new Parser(E,F);return G.parse(D);};Parser.prototype.parse=function(D){this.inline=new InlineLexer(D.links,this.options,this.renderer); -this.tokens=D.reverse();var E='';while(this.next()){E+=this.tok();}return E;};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 D=this.token.text; -while(this.peek().type==='text'){D+='\n'+this.next().text;}return this.inline.output(D);};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 D='',E='',i,F,G,H,j;G='';for(i=0;i/g,'>').replace(/"/g,'"').replace(/'/g,''');}function unescape(D){return D.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(D,E){D=D.source;E=E||'';return function F(G,H){if(!G){return new RegExp(D,E); -}H=H.source||H;H=H.replace(/(^|[^\[])\^/g,'$1');D=D.replace(G,H);return F;};}function noop(){}noop.exec=noop;function merge(D){var i=1,E,F;for(;iAn error occured:

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

    '+E+'

    \n';};Renderer.prototype.table=function(E,F){return '\n'+'\n'+E+'\n'+'\n'+F+'\n'+'
    \n'; +};Renderer.prototype.tablerow=function(E){return '\n'+E+'\n';};Renderer.prototype.tablecell=function(E,F){var G=F.header?'th':'td';var H=F.align?'<'+G+' style="text-align:'+F.align+'">':'<'+G+'>';return H+E+'\n';};Renderer.prototype.strong=function(E){return ''+E+''; +};Renderer.prototype.em=function(E){return ''+E+'';};Renderer.prototype.codespan=function(E){return ''+E+'';};Renderer.prototype.br=function(){return this.options.xhtml?'
    ':'
    ';};Renderer.prototype.del=function(E){return ''+E+''; +};Renderer.prototype.link=function(E,F,G){if(this.options.sanitize){try{var H=decodeURIComponent(unescape(E)).replace(/[^\w:]/g,'').toLowerCase();}catch(e){return '';}if(H.indexOf('javascript:')===0||H.indexOf('vbscript:')===0){return '';}}var I='
    ';return I;};Renderer.prototype.image=function(E,F,G){var H=''+G+'':'>';return H;};Renderer.prototype.text=function(E){return E;};function Parser(E){this.tokens=[]; +this.token=null;this.options=E||marked.defaults;this.options.renderer=this.options.renderer||new Renderer;this.renderer=this.options.renderer;this.renderer.options=this.options;}Parser.parse=function(E,F,G){var H=new Parser(F,G);return H.parse(E);};Parser.prototype.parse=function(E){this.inline=new D(E.links,this.options,this.renderer); +this.tokens=E.reverse();var F='';while(this.next()){F+=this.tok();}return F;};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 E=this.token.text; +while(this.peek().type==='text'){E+='\n'+this.next().text;}return this.inline.output(E);};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 E='',F='',i,G,H,I,j;H='';for(i=0;i/g,'>').replace(/"/g,'"').replace(/'/g,''');}function unescape(E){return E.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(E,F){E=E.source;F=F||'';return function G(H,I){if(!H){return new RegExp(E,F); +}I=I.source||I;I=I.replace(/(^|[^\[])\^/g,'$1');E=E.replace(H,I);return G;};}function noop(){}noop.exec=noop;function merge(E){var i=1,F,G;for(;iAn error occured:

    '+escape(e.message+'',true)+'
    '; +}throw e;}}marked.options=marked.setOptions=function(E){merge(marked.defaults,E);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 Renderer,xhtml:false} +;marked.Parser=Parser;marked.parser=Parser.parse;marked.Renderer=Renderer;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 4a7002ae77..aecbedb276 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -17316,7 +17316,7 @@ Roo.Markdown.toHtml = function(text) { * Inline Lexer & Compiler */ - function InlineLexer(links, options) { + var InlineLexer = function (links, options) { this.options = options || marked.defaults; this.links = links; this.rules = inline.normal; diff --git a/roojs-core.js b/roojs-core.js index ced05995d5..4300a794d5 100644 --- a/roojs-core.js +++ b/roojs-core.js @@ -688,57 +688,57 @@ 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(D){this.tokens=[];this.tokens.links={};this.options=D||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(D,E){var F=new B(E);return F.lex(D); -};B.prototype.lex=function(D){D=D.replace(/\r\n|\r/g,'\n').replace(/\t/g,' ').replace(/\u00a0/g,' ').replace(/\u2424/g,'\n');return this.token(D,true);};B.prototype.token=function(D,E,bq){var D=D.replace(/^ +$/gm,''),F,G,H,I,b,J,K,i,l;while(D){if(H=this.rules.newline.exec(D)){D=D.substring(H[0].length); -if(H[0].length>1){this.tokens.push({type:'space'});}}if(H=this.rules.code.exec(D)){D=D.substring(H[0].length);H=H[0].replace(/^ {4}/gm,'');this.tokens.push({type:'code',text:!this.options.pedantic?H.replace(/\n+$/,''):H});continue;}if(H=this.rules.fences.exec(D)){D=D.substring(H[0].length); -this.tokens.push({type:'code',lang:H[2],text:H[3]||''});continue;}if(H=this.rules.heading.exec(D)){D=D.substring(H[0].length);this.tokens.push({type:'heading',depth:H[1].length,text:H[2]});continue;}if(E&&(H=this.rules.nptable.exec(D))){D=D.substring(H[0].length); -J={type:'table',header:H[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:H[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:H[3].replace(/\n$/,'').split('\n')};for(i=0;i ?/gm,'');this.token(H,E,true); -this.tokens.push({type:'blockquote_end'});continue;}if(H=this.rules.list.exec(D)){D=D.substring(H[0].length);I=H[2];this.tokens.push({type:'list_start',ordered:I.length>1});H=H[0].match(this.rules.item);F=false;l=H.length;i=0;for(;i1&&b.length>1)){D=H.slice(i+1).join('\n')+D; -i=l-1;}}G=F||/\n\n(?!\s*$)/.test(J);if(i!==l-1){F=J.charAt(J.length-1)==='\n';if(!G){G=F;}}this.tokens.push({type:G?'loose_item_start':'list_item_start'});this.token(J,false,bq);this.tokens.push({type:'list_item_end'});}this.tokens.push({type:'list_end'}); -continue;}if(H=this.rules.html.exec(D)){D=D.substring(H[0].length);this.tokens.push({type:this.options.sanitize?'paragraph':'html',pre:!this.options.sanitizer&&(H[1]==='pre'||H[1]==='script'||H[1]==='style'),text:H[0]});continue;}if((!bq&&E)&&(H=this.rules.def.exec(D))){D=D.substring(H[0].length); -this.tokens.links[H[1].toLowerCase()]={href:H[2],title:H[3]};continue;}if(E&&(H=this.rules.table.exec(D))){D=D.substring(H[0].length);J={type:'table',header:H[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:H[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:H[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(I=this.rules.code.exec(E)){E=E.substring(I[0].length);I=I[0].replace(/^ {4}/gm,'');this.tokens.push({type:'code',text:!this.options.pedantic?I.replace(/\n+$/,''):I});continue;}if(I=this.rules.fences.exec(E)){E=E.substring(I[0].length); +this.tokens.push({type:'code',lang:I[2],text:I[3]||''});continue;}if(I=this.rules.heading.exec(E)){E=E.substring(I[0].length);this.tokens.push({type:'heading',depth:I[1].length,text:I[2]});continue;}if(F&&(I=this.rules.nptable.exec(E))){E=E.substring(I[0].length); +K={type:'table',header:I[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:I[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:I[3].replace(/\n$/,'').split('\n')};for(i=0;i ?/gm,'');this.token(I,F,true); +this.tokens.push({type:'blockquote_end'});continue;}if(I=this.rules.list.exec(E)){E=E.substring(I[0].length);J=I[2];this.tokens.push({type:'list_start',ordered:J.length>1});I=I[0].match(this.rules.item);G=false;l=I.length;i=0;for(;i1&&b.length>1)){E=I.slice(i+1).join('\n')+E; +i=l-1;}}H=G||/\n\n(?!\s*$)/.test(K);if(i!==l-1){G=K.charAt(K.length-1)==='\n';if(!H){H=G;}}this.tokens.push({type:H?'loose_item_start':'list_item_start'});this.token(K,false,bq);this.tokens.push({type:'list_item_end'});}this.tokens.push({type:'list_end'}); +continue;}if(I=this.rules.html.exec(E)){E=E.substring(I[0].length);this.tokens.push({type:this.options.sanitize?'paragraph':'html',pre:!this.options.sanitizer&&(I[1]==='pre'||I[1]==='script'||I[1]==='style'),text:I[0]});continue;}if((!bq&&F)&&(I=this.rules.def.exec(E))){E=E.substring(I[0].length); +this.tokens.links[I[1].toLowerCase()]={href:I[2],title:I[3]};continue;}if(F&&(I=this.rules.table.exec(E))){E=E.substring(I[0].length);K={type:'table',header:I[1].replace(/^ *| *\| *$/g,'').split(/ *\| */),align:I[2].replace(/^ *|\| *$/g,'').split(/ *\| */),cells:I[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,}','*')()});function InlineLexer(D,E){this.options=E||marked.defaults;this.links=D;this.rules=C.normal;this.renderer=this.options.renderer||new Renderer;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;}}InlineLexer.rules=C;InlineLexer.output=function(D,E,F){var G=new InlineLexer(E,F); -return G.output(D);};InlineLexer.prototype.output=function(D){var E='',F,G,H,I;while(D){if(I=this.rules.escape.exec(D)){D=D.substring(I[0].length);E+=I[1];continue;}if(I=this.rules.autolink.exec(D)){D=D.substring(I[0].length);if(I[2]==='@'){G=I[1].charAt(6)===':'?this.mangle(I[1].substring(7)):this.mangle(I[1]); -H=this.mangle('mailto:')+G;}else{G=escape(I[1]);H=G;}E+=this.renderer.link(H,null,G);continue;}if(!this.inLink&&(I=this.rules.url.exec(D))){D=D.substring(I[0].length);G=escape(I[1]);H=G;E+=this.renderer.link(H,null,G);continue;}if(I=this.rules.tag.exec(D)){if(!this.inLink&&/^
    /i.test(I[0])){this.inLink=false;}D=D.substring(I[0].length);E+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(I[0]):escape(I[0]):I[0];continue;}if(I=this.rules.link.exec(D)){D=D.substring(I[0].length);this.inLink=true; -E+=this.outputLink(I,{href:I[2],title:I[3]});this.inLink=false;continue;}if((I=this.rules.reflink.exec(D))||(I=this.rules.nolink.exec(D))){D=D.substring(I[0].length);F=(I[2]||I[1]).replace(/\s+/g,' ');F=this.links[F.toLowerCase()];if(!F||!F.href){E+=I[0].charAt(0); -D=I[0].substring(1)+D;continue;}this.inLink=true;E+=this.outputLink(I,F);this.inLink=false;continue;}if(I=this.rules.strong.exec(D)){D=D.substring(I[0].length);E+=this.renderer.strong(this.output(I[2]||I[1]));continue;}if(I=this.rules.em.exec(D)){D=D.substring(I[0].length); -E+=this.renderer.em(this.output(I[2]||I[1]));continue;}if(I=this.rules.code.exec(D)){D=D.substring(I[0].length);E+=this.renderer.codespan(escape(I[2],true));continue;}if(I=this.rules.br.exec(D)){D=D.substring(I[0].length);E+=this.renderer.br();continue;}if(I=this.rules.del.exec(D)){D=D.substring(I[0].length); -E+=this.renderer.del(this.output(I[1]));continue;}if(I=this.rules.text.exec(D)){D=D.substring(I[0].length);E+=this.renderer.text(escape(this.smartypants(I[0])));continue;}if(D){throw new Error('Infinite loop on byte: '+D.charCodeAt(0));}}return E;};InlineLexer.prototype.outputLink=function(D,E){var F=escape(E.href),G=E.title?escape(E.title):null; -return D[0].charAt(0)!=='!'?this.renderer.link(F,G,this.output(D[1])):this.renderer.image(F,G,escape(D[1]));};InlineLexer.prototype.smartypants=function(D){if(!this.options.smartypants){return D;}return D.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'); -};InlineLexer.prototype.mangle=function(D){if(!this.options.mangle){return D;}var E='',l=D.length,i=0,ch;for(;i0.5){ch='x'+ch.toString(16);}E+='&#'+ch+';';}return E;};function Renderer(D){this.options=D||{};}Renderer.prototype.code=function(D,E,F){if(this.options.highlight){var G=this.options.highlight(D,E); -if(G!=null&&G!==D){F=true;D=G;}}else{F=true;}if(!E){return '
    '+(F?D:escape(D,true))+'\n
    ';}return '
    '+(F?D:escape(D,true))+'\n
    \n';};Renderer.prototype.blockquote=function(D){return '
    \n'+D+'
    \n'; -};Renderer.prototype.html=function(D){return D;};Renderer.prototype.heading=function(D,E,F){return ''+D+'\n';};Renderer.prototype.hr=function(){return this.options.xhtml?'
    \n':'
    \n'; -};Renderer.prototype.list=function(D,E){var F=E?'ol':'ul';return '<'+F+'>\n'+D+'\n';};Renderer.prototype.listitem=function(D){return '
  • '+D+'
  • \n';};Renderer.prototype.paragraph=function(D){return '

    '+D+'

    \n';};Renderer.prototype.table=function(D,E){return '\n'+'\n'+D+'\n'+'\n'+E+'\n'+'
    \n'; -};Renderer.prototype.tablerow=function(D){return '\n'+D+'\n';};Renderer.prototype.tablecell=function(D,E){var F=E.header?'th':'td';var G=E.align?'<'+F+' style="text-align:'+E.align+'">':'<'+F+'>';return G+D+'\n';};Renderer.prototype.strong=function(D){return ''+D+''; -};Renderer.prototype.em=function(D){return ''+D+'';};Renderer.prototype.codespan=function(D){return ''+D+'';};Renderer.prototype.br=function(){return this.options.xhtml?'
    ':'
    ';};Renderer.prototype.del=function(D){return ''+D+''; -};Renderer.prototype.link=function(D,E,F){if(this.options.sanitize){try{var G=decodeURIComponent(unescape(D)).replace(/[^\w:]/g,'').toLowerCase();}catch(e){return '';}if(G.indexOf('javascript:')===0||G.indexOf('vbscript:')===0){return '';}}var H='
    ';return H;};Renderer.prototype.image=function(D,E,F){var G=''+F+'':'>';return G;};Renderer.prototype.text=function(D){return D;};function Parser(D){this.tokens=[]; -this.token=null;this.options=D||marked.defaults;this.options.renderer=this.options.renderer||new Renderer;this.renderer=this.options.renderer;this.renderer.options=this.options;}Parser.parse=function(D,E,F){var G=new Parser(E,F);return G.parse(D);};Parser.prototype.parse=function(D){this.inline=new InlineLexer(D.links,this.options,this.renderer); -this.tokens=D.reverse();var E='';while(this.next()){E+=this.tok();}return E;};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 D=this.token.text; -while(this.peek().type==='text'){D+='\n'+this.next().text;}return this.inline.output(D);};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 D='',E='',i,F,G,H,j;G='';for(i=0;i/g,'>').replace(/"/g,'"').replace(/'/g,''');}function unescape(D){return D.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(D,E){D=D.source;E=E||'';return function F(G,H){if(!G){return new RegExp(D,E); -}H=H.source||H;H=H.replace(/(^|[^\[])\^/g,'$1');D=D.replace(G,H);return F;};}function noop(){}noop.exec=noop;function merge(D){var i=1,E,F;for(;iAn error occured:

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

    '+E+'

    \n';};Renderer.prototype.table=function(E,F){return '\n'+'\n'+E+'\n'+'\n'+F+'\n'+'
    \n'; +};Renderer.prototype.tablerow=function(E){return '\n'+E+'\n';};Renderer.prototype.tablecell=function(E,F){var G=F.header?'th':'td';var H=F.align?'<'+G+' style="text-align:'+F.align+'">':'<'+G+'>';return H+E+'\n';};Renderer.prototype.strong=function(E){return ''+E+''; +};Renderer.prototype.em=function(E){return ''+E+'';};Renderer.prototype.codespan=function(E){return ''+E+'';};Renderer.prototype.br=function(){return this.options.xhtml?'
    ':'
    ';};Renderer.prototype.del=function(E){return ''+E+''; +};Renderer.prototype.link=function(E,F,G){if(this.options.sanitize){try{var H=decodeURIComponent(unescape(E)).replace(/[^\w:]/g,'').toLowerCase();}catch(e){return '';}if(H.indexOf('javascript:')===0||H.indexOf('vbscript:')===0){return '';}}var I='
    ';return I;};Renderer.prototype.image=function(E,F,G){var H=''+G+'':'>';return H;};Renderer.prototype.text=function(E){return E;};function Parser(E){this.tokens=[]; +this.token=null;this.options=E||marked.defaults;this.options.renderer=this.options.renderer||new Renderer;this.renderer=this.options.renderer;this.renderer.options=this.options;}Parser.parse=function(E,F,G){var H=new Parser(F,G);return H.parse(E);};Parser.prototype.parse=function(E){this.inline=new D(E.links,this.options,this.renderer); +this.tokens=E.reverse();var F='';while(this.next()){F+=this.tok();}return F;};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 E=this.token.text; +while(this.peek().type==='text'){E+='\n'+this.next().text;}return this.inline.output(E);};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 E='',F='',i,G,H,I,j;H='';for(i=0;i/g,'>').replace(/"/g,'"').replace(/'/g,''');}function unescape(E){return E.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(E,F){E=E.source;F=F||'';return function G(H,I){if(!H){return new RegExp(E,F); +}I=I.source||I;I=I.replace(/(^|[^\[])\^/g,'$1');E=E.replace(H,I);return G;};}function noop(){}noop.exec=noop;function merge(E){var i=1,F,G;for(;iAn error occured:

    '+escape(e.message+'',true)+'
    '; +}throw e;}}marked.options=marked.setOptions=function(E){merge(marked.defaults,E);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 Renderer,xhtml:false} +;marked.Parser=Parser;marked.parser=Parser.parse;marked.Renderer=Renderer;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 0a37da05e6..a6b7c027db 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -17316,7 +17316,7 @@ Roo.Markdown.toHtml = function(text) { * Inline Lexer & Compiler */ - function InlineLexer(links, options) { + var InlineLexer = function (links, options) { this.options = options || marked.defaults; this.links = links; this.rules = inline.normal; -- 2.39.2