From: Alan Knowles '+K+'
';}return ''+(M?K:G(K,true))+'\n
\n';};E.prototype.blockquote=function(K){return ''+(M?K:G(K,true))+'\n
\n'+K+'
\n';
-};E.prototype.html=function(K){return K;};E.prototype.heading=function(K,L,M){return '
\n':'
\n';
-};E.prototype.list=function(K,L){var M=L?'ol':'ul';return '<'+M+'>\n'+K+''+M+'>\n';};E.prototype.listitem=function(K){return '\n'+'\n'+K+'\n'+'\n'+L+'\n'+'
\n';
-};E.prototype.tablerow=function(K){return '\n'+K+' \n';};E.prototype.tablecell=function(K,L){var M=L.header?'th':'td';var N=L.align?'<'+M+' style="text-align:'+L.align+'">':'<'+M+'>';return N+K+''+M+'>\n';};E.prototype.strong=function(K){return ''+K+'';
-};E.prototype.em=function(K){return ''+K+'';};E.prototype.codespan=function(K){return ''+K+'
';};E.prototype.br=function(){return this.options.xhtml?'
':'
';};E.prototype.del=function(K){return ''+K+'';};E.prototype.link=function(K,L,M){if(this.options.sanitize){try{var N=decodeURIComponent(H(K)).replace(/[^\w:]/g,'').toLowerCase();
-}catch(e){return '';}if(N.indexOf('javascript:')===0||N.indexOf('vbscript:')===0){return '';}}var O=''+M+'';return O;};E.prototype.image=function(K,L,M){var N='':'>';return N;};E.prototype.text=function(K){return K;};var F=function(K){this.tokens=[];this.token=null;this.options=K||marked.defaults;this.options.renderer=this.options.renderer||new E;this.renderer=this.options.renderer;this.renderer.options=this.options;
-};F.parse=function(K,L,M){var N=new F(L,M);return N.parse(K);};F.prototype.parse=function(K){this.inline=new D(K.links,this.options,this.renderer);this.tokens=K.reverse();var L='';while(this.next()){L+=this.tok();}return L;};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 K=this.token.text;while(this.peek().type==='text'){K+='\n'+this.next().text;}return this.inline.output(K);};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 K='',L='',i,M,N,O,j;
-N='';for(i=0;i
'+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;})(); +return Roo.Markdown.marked(A);};(function(){var A={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:noop,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:noop,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: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',/
'+(K?I:G(I,true))+'\n
';}return ''+(K?I:G(I,true))+'\n
\n';};E.prototype.blockquote=function(I){return '\n'+I+'\n'; +};E.prototype.html=function(I){return I;};E.prototype.heading=function(I,J,K){return '
'+I+'
\n';};E.prototype.table=function(I,J){return ''+I+'
';};E.prototype.br=function(){return this.options.xhtml?''+G(e.message+'',true)+'';}throw e;}};marked.options=marked.setOptions=function(I){H(marked.defaults,I); +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 7f131fb8e3..0bb8e35b80 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -17895,7 +17895,7 @@ Roo.Markdown.toHtml = function(text) { .replace(/'/g, '''); } - function unescape(html) { + var unescape = function (html) { // explicitly match decimal, hex, and named HTML entities return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g, function(_, n) { n = n.toLowerCase(); @@ -17909,7 +17909,7 @@ Roo.Markdown.toHtml = function(text) { }); } - function replace(regex, opt) { + var replace= function (regex, opt) { regex = regex.source; opt = opt || ''; return function self(name, val) { @@ -17921,10 +17921,10 @@ Roo.Markdown.toHtml = function(text) { }; } - function noop() {} + var noop = function () {} noop.exec = noop; - function merge(obj) { + var merge = function (obj) { var i = 1 , target , key; @@ -17946,7 +17946,7 @@ Roo.Markdown.toHtml = function(text) { * Marked */ - function marked(src, opt, callback) { + var marked = function (src, opt, callback) { if (callback || typeof opt === 'function') { if (!callback) { callback = opt; diff --git a/roojs-core.js b/roojs-core.js index 5272bb9eeb..e01be5dbb8 100644 --- a/roojs-core.js +++ b/roojs-core.js @@ -683,61 +683,62 @@ Roo.debug&&Roo.log(C);if(!E.hideProgress&&Roo.MessageBox){Roo.MessageBox.updateP // Roo/Markdown.js Roo.Markdown={};Roo.Markdown.toHtml=function(A){var c=new Roo.Markdown.marked.setOptions({renderer:new Roo.Markdown.marked.Renderer(),gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,smartLists:true,smartypants:false});A=A.replace(/\\\n/g,' '); -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;})(); +return Roo.Markdown.marked(A);};(function(){var A={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:noop,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:noop,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: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',/
'+(K?I:G(I,true))+'\n
';}return ''+(K?I:G(I,true))+'\n
\n';};E.prototype.blockquote=function(I){return '\n'+I+'\n'; +};E.prototype.html=function(I){return I;};E.prototype.heading=function(I,J,K){return '
'+I+'
\n';};E.prototype.table=function(I,J){return ''+I+'
';};E.prototype.br=function(){return this.options.xhtml?''+G(e.message+'',true)+'';}throw e;}};marked.options=marked.setOptions=function(I){H(marked.defaults,I); +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 f152960d69..9cc7533a31 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -17895,7 +17895,7 @@ Roo.Markdown.toHtml = function(text) { .replace(/'/g, '''); } - function unescape(html) { + var unescape = function (html) { // explicitly match decimal, hex, and named HTML entities return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g, function(_, n) { n = n.toLowerCase(); @@ -17909,7 +17909,7 @@ Roo.Markdown.toHtml = function(text) { }); } - function replace(regex, opt) { + var replace= function (regex, opt) { regex = regex.source; opt = opt || ''; return function self(name, val) { @@ -17921,10 +17921,10 @@ Roo.Markdown.toHtml = function(text) { }; } - function noop() {} + var noop = function () {} noop.exec = noop; - function merge(obj) { + var merge = function (obj) { var i = 1 , target , key; @@ -17946,7 +17946,7 @@ Roo.Markdown.toHtml = function(text) { * Marked */ - function marked(src, opt, callback) { + var marked = function (src, opt, callback) { if (callback || typeof opt === 'function') { if (!callback) { callback = opt;