From b8564cc1726448a73bf1eaa0b0c9a9bd862df96b Mon Sep 17 00:00:00 2001
From: Alan Knowles '+E+'
';}return ''+(G?E:escape(E,true))+'\n
\n';};Renderer.prototype.blockquote=function(E){return ''+(G?E:escape(E,true))+'\n
\n'+E+'
\n';
-};Renderer.prototype.html=function(E){return E;};Renderer.prototype.heading=function(E,F,G){return '
\n':'
\n';
-};Renderer.prototype.list=function(E,F){var G=F?'ol':'ul';return '<'+G+'>\n'+E+''+G+'>\n';};Renderer.prototype.listitem=function(E){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+''+G+'>\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=''+G+'';return I;};Renderer.prototype.image=function(E,F,G){var H='':'>';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
'+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;})(); +);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(;i
'+(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.table=function(F,G){return ''+F+'
';};E.prototype.br=function(){return this.options.xhtml?''+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;})(); // 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 aecbedb276..30edece245 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -17556,7 +17556,7 @@ Roo.Markdown.toHtml = function(text) { * Renderer */ - function Renderer(options) { + var Renderer = function (options) { this.options = options || {}; } diff --git a/roojs-core.js b/roojs-core.js index 4300a794d5..a71159b302 100644 --- a/roojs-core.js +++ b/roojs-core.js @@ -688,57 +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',/
'+(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;})(); +);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(;i
'+(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.table=function(F,G){return ''+F+'
';};E.prototype.br=function(){return this.options.xhtml?''+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;})(); // 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 a6b7c027db..c686fb71ed 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -17556,7 +17556,7 @@ Roo.Markdown.toHtml = function(text) { * Renderer */ - function Renderer(options) { + var Renderer = function (options) { this.options = options || {}; } -- 2.39.2