From: Alan Knowles '+G+'
';}return ''+(I?G:escape(G,true))+'\n
\n';};E.prototype.blockquote=function(G){return ''+(I?G:escape(G,true))+'\n
\n'+G+'
\n';
-};E.prototype.html=function(G){return G;};E.prototype.heading=function(G,H,I){return '
\n':'
\n';
-};E.prototype.list=function(G,H){var I=H?'ol':'ul';return '<'+I+'>\n'+G+''+I+'>\n';};E.prototype.listitem=function(G){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+''+I+'>\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=''+I+'';return K;};E.prototype.image=function(G,H,I){var J='':'>';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
'+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} +return Roo.Markdown.marked(A);};(function(){var A={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:J,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:J,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,def:/^ *\[([^\]]+)\]: *([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:J,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/} +;A.bullet=/(?:[*+-]|\d+\.)/;A.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;A.item=I(A.item,'gm')(/bull/g,A.bullet)();A.list=I(A.list)(/bull/g,A.bullet)('hr','\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))')('def','\\n+(?='+A.def.source+')')();A.blockquote=I(A.blockquote)('def',A.def)(); +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=I(A.html)('comment',//)('closed',/<(tag)[\s\S]+?<\/\1>/)('closing',/
'+(M?K:G(K,true))+'\n
';}return ''+(M?K:G(K,true))+'\n
\n';};E.prototype.blockquote=function(K){return '\n'+K+'\n'; +};E.prototype.html=function(K){return K;};E.prototype.heading=function(K,L,M){return '
'+K+'
\n';};E.prototype.table=function(K,L){return ''+K+'
';};E.prototype.br=function(){return this.options.xhtml?''+G(e.message+'',true)+'';}throw e;}}marked.options=marked.setOptions=function(K){merge(marked.defaults,K);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; diff --git a/roojs-core-debug.js b/roojs-core-debug.js index 5fe012b525..7f131fb8e3 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -17886,7 +17886,7 @@ Roo.Markdown.toHtml = function(text) { * Helpers */ - function escape(html, encode) { + var escape = function (html, encode) { return html .replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&') .replace(/[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,def:/^ *\[([^\]]+)\]: *([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:noop,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/} -;A.bullet=/(?:[*+-]|\d+\.)/;A.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;A.item=replace(A.item,'gm')(/bull/g,A.bullet)();A.list=replace(A.list)(/bull/g,A.bullet)('hr','\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))')('def','\\n+(?='+A.def.source+')')();A.blockquote=replace(A.blockquote)('def',A.def)(); -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',/
'+(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.table=function(G,H){return ''+G+'
';};E.prototype.br=function(){return this.options.xhtml?''+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} +return Roo.Markdown.marked(A);};(function(){var A={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:J,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:J,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,def:/^ *\[([^\]]+)\]: *([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:J,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/} +;A.bullet=/(?:[*+-]|\d+\.)/;A.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;A.item=I(A.item,'gm')(/bull/g,A.bullet)();A.list=I(A.list)(/bull/g,A.bullet)('hr','\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))')('def','\\n+(?='+A.def.source+')')();A.blockquote=I(A.blockquote)('def',A.def)(); +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=I(A.html)('comment',//)('closed',/<(tag)[\s\S]+?<\/\1>/)('closing',/
'+(M?K:G(K,true))+'\n
';}return ''+(M?K:G(K,true))+'\n
\n';};E.prototype.blockquote=function(K){return '\n'+K+'\n'; +};E.prototype.html=function(K){return K;};E.prototype.heading=function(K,L,M){return '
'+K+'
\n';};E.prototype.table=function(K,L){return ''+K+'
';};E.prototype.br=function(){return this.options.xhtml?''+G(e.message+'',true)+'';}throw e;}}marked.options=marked.setOptions=function(K){merge(marked.defaults,K);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; diff --git a/roojs-debug.js b/roojs-debug.js index 4bd6823ab6..f152960d69 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -17886,7 +17886,7 @@ Roo.Markdown.toHtml = function(text) { * Helpers */ - function escape(html, encode) { + var escape = function (html, encode) { return html .replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&') .replace(/