From: Alan Knowles '+D+'
';}return ''+(F?D:escape(D,true))+'\n
\n';};Renderer.prototype.blockquote=function(D){return ''+(F?D:escape(D,true))+'\n
\n'+D+'
\n';
-};Renderer.prototype.html=function(D){return D;};Renderer.prototype.heading=function(D,E,F){return '
\n':'
\n';
-};Renderer.prototype.list=function(D,E){var F=E?'ol':'ul';return '<'+F+'>\n'+D+''+F+'>\n';};Renderer.prototype.listitem=function(D){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+''+F+'>\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=''+F+'';return H;};Renderer.prototype.image=function(D,E,F){var G='':'>';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
'+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(;i
'+(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.table=function(E,F){return ''+E+'
';};Renderer.prototype.br=function(){return this.options.xhtml?''+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',/
'+(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.table=function(D,E){return ''+D+'
';};Renderer.prototype.br=function(){return this.options.xhtml?''+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(;i
'+(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.table=function(E,F){return ''+E+'
';};Renderer.prototype.br=function(){return this.options.xhtml?''+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;