diff --git a/admin/js/hyperdown.js b/admin/js/hyperdown.js index eccccb67..2f32273f 100644 --- a/admin/js/hyperdown.js +++ b/admin/js/hyperdown.js @@ -1 +1 @@ -(function(){var t,k,n,d,c,g,$,f,B=[].slice;function e(){this.commonWhiteList="kbd|b|i|strong|em|sup|sub|br|code|del|a|hr|small",this.blockHtmlTags="p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|svg|script|noscript",this.specialWhiteList={table:"table|tbody|thead|tfoot|tr|td|th"},this.hooks={},this.html=!1,this.line=!1,this.blockParsers=[["code",10],["shtml",20],["pre",30],["ahtml",40],["shr",50],["list",60],["math",70],["html",80],["footnote",90],["definition",100],["quote",110],["table",120],["sh",130],["mh",140],["dhr",150],["default",9999]],this.parsers={}}f=function(t){return t.charAt(0).toUpperCase()+t.substring(1)},c=function(t){return t.replace(/[-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")},g=function(t,e,r){var n,s,l,i,o,a;if(t instanceof Array)if(e instanceof Array)for(n=s=0,i=t.length;s/g,">").replace(/"/g,""")},$=function(t,e){var r,n,s,l,i;if(null==e&&(e=null),null==e)return t.replace(/^\s*/,"").replace(/\s*$/,"");for(i="",n=s=0,l=e.length-1;0<=l?s<=l:l<=s;n=0<=l?++s:--s)r=e[n],i+=c(r);return i="["+i+"]*",t.replace(new RegExp("^"+i),"").replace(new RegExp(i+"$"),"")},k=function(t){var e,r,n,s=[];if(t instanceof Array)for(r=e=0,n=t.length;e↩':(r[r.length-1]+=' ',r=1'+r+"",e+=1;t+=""}return t},e.prototype.parse=function(t,e,r){var n,s,l,i,o,a,c,h,p,u;for(null==e&&(e=!1),null==r&&(r=0),a=[],n=this.parseBlock(t,a),l="",e&&1===n.length&&"normal"===n[0][0]&&(n[0][3]=!0),i=0,o=n.length;i':""},e.prototype.markLines=function(t,e){var r,n=-1;return this.line?t.map((r=this,function(t){return n+=1,r.markLine(e+n)+t})):t},e.prototype.optimizeLines=function(t){var r=0,e=new RegExp('class="line" data\\-start="([0-9]+)" data\\-end="([0-9]+)" (data\\-id="'+this.uniqid+'")',"g");return this.line?t.replace(e,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=r!==parseInt(t[1])?'class="line" data-start="'+r+'" data-start-original="'+t[1]+'" data-end="'+t[2]+'" '+t[3]:t[0];return r=1+parseInt(t[2]),e}):t},e.prototype.parseInline=function(t,e,r,n){var s,l,i,o,a,c,h,p,u,f,k,m;return null==e&&(e=""),null==r&&(r=!0),null==n&&(n=!0),t=(t=(t=(t=(t=(t=this.call("beforeParseInline",t)).replace(/(^|[^\\])(`+)(.+?)\2/gm,(s=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+s.makeHolder(""+d(t[3])+"")}))).replace(/(^|[^\\])(\$+)(.+?)\2/gm,(l=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+l.makeHolder(t[2]+d(t[3])+t[2])}))).replace(/\\(.)/g,(i=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=t[1].match(/^[-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]$/)?"":"\\",t=d(t[1]);return t=t.replace(/\$/g,"$"),i.makeHolder(e+t)}))).replace(/<(https?:\/\/.+|(?:mailto:)?[_a-z0-9-\.\+]+@[_\w-]+\.[a-z]{2,})>/gi,(o=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=o.cleanUrl(t[1]),t=o.call("parseLink",e);return o.makeHolder(''+t+"")}))).replace(/<(\/?)([a-z0-9-]+)(\s+[^>]*)?>/gi,(a=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return a.html||0<=("|"+a.commonWhiteList+"|"+e+"|").indexOf("|"+t[2].toLowerCase()+"|")?a.makeHolder(t[0]):a.makeHolder(d(t[0]))})),this.html&&(t=t.replace(//g,(c=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return c.makeHolder(t[0])}))),t=(t=(t=(t=(t=(t=g(["<",">"],["<",">"],t)).replace(/\[\^((?:[^\]]|\\\]|\\\[)+?)\]/g,(h=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=h.footnotes.indexOf(t[1]);return e<0&&(e=h.footnotes.length+1,h.footnotes.push(h.parseInline(t[1],"",!1))),h.makeHolder(''+e+"")}))).replace(/!\[((?:[^\]]|\\\]|\\\[)*?)\]\(((?:[^\)]|\\\)|\\\()+?)\)/g,(p=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=d(p.escapeBracket(t[1])),t=p.escapeBracket(t[2]);return t=p.cleanUrl(t),p.makeHolder(''+e+'')}))).replace(/!\[((?:[^\]]|\\\]|\\\[)*?)\]\[((?:[^\]]|\\\]|\\\[)+?)\]/g,(u=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=d(u.escapeBracket(t[1])),e=null!=u.definitions[t[2]]?''+e+'':e;return u.makeHolder(e)}))).replace(/\[((?:[^\]]|\\\]|\\\[)+?)\]\(((?:[^\)]|\\\)|\\\()+?)\)/g,(f=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=f.parseInline(f.escapeBracket(t[1]),"",!1,!1),t=f.escapeBracket(t[2]);return t=f.cleanUrl(t),f.makeHolder(''+e+"")}))).replace(/\[((?:[^\]]|\\\]|\\\[)+?)\]\[((?:[^\]]|\\\]|\\\[)+?)\]/g,(k=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=k.parseInline(k.escapeBracket(t[1]),"",!1,!1),e=null!=k.definitions[t[2]]?''+e+"":e;return k.makeHolder(e)})),t=this.parseInlineCallback(t),n&&(t=t.replace(/(^|[^\"])(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&\/=]*)|(?:mailto:)?[_a-z0-9-\.\+]+@[_\w-]+\.[a-z]{2,})($|[^\"])/g,(m=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=m.cleanUrl(t[2]),e=m.call("parseLink",e);return t[1]+''+t[2]+""+t[5]}))),t=this.call("afterParseInlineBeforeRelease",t),t=this.releaseHolder(t,r),t=this.call("afterParseInline",t)},e.prototype.parseInlineCallback=function(t){var e,r,n,s,l,i,o;return t=(t=(t=(t=(t=(t=(t=t.replace(/(\*{3})((?:.|\r)+?)\1/gm,(e=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return""+e.parseInlineCallback(t[2])+""}))).replace(/(\*{2})((?:.|\r)+?)\1/gm,(r=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return""+r.parseInlineCallback(t[2])+""}))).replace(/(\*)((?:.|\r)+?)\1/gm,(n=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return""+n.parseInlineCallback(t[2])+""}))).replace(/(\s+|^)(_{3})((?:.|\r)+?)\2(\s+|$)/gm,(s=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+""+s.parseInlineCallback(t[3])+""+t[4]}))).replace(/(\s+|^)(_{2})((?:.|\r)+?)\2(\s+|$)/gm,(l=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+""+l.parseInlineCallback(t[3])+""+t[4]}))).replace(/(\s+|^)(_)((?:.|\r)+?)\2(\s+|$)/gm,(i=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+""+i.parseInlineCallback(t[3])+""+t[4]}))).replace(/(~{2})((?:.|\r)+?)\1/gm,(o=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return""+o.parseInlineCallback(t[2])+""}))},e.prototype.parseBlock=function(t,e){for(var r,n,s,l,i,o,a,c,h,p=t.split("\n"),u=0,f=p.length;u=t[3][0]+n.empty)return n.empty=0,this.setBlock(e),!1;if(r.match(/^\s*$/)&&0===n.empty)return n.empty+=1,this.setBlock(e),!1}return!(l=r.match(/^(\s*)((?:[0-9]+\.)|\-|\+|\*)\s+/i))||(s=l[1].length,r=l[0].length-s,l=(n.empty=0)<="+-*".indexOf(l[2])?"ul":"ol",!this.isBlock("list")||s=t+n.empty),n.code=r[2],this.startBlock("code",e,[r[1],r[3],s]);return!1}return!this.isBlock("code")||(this.setBlock(e),!1)},e.prototype.parseBlockShtml=function(t,e,r,n){if(this.html){if(r.match(/^(\s*)!!!(\s*)$/))return this.isBlock("shtml")?this.setBlock(e).endBlock():this.startBlock("shtml",e),!1;if(this.isBlock("shtml"))return this.setBlock(e),!1}return!0},e.prototype.parseBlockAhtml=function(t,e,r,n){var s,l,i,o;if(this.html)if(o=new RegExp("^\\s*<("+this.blockHtmlTags+")(\\s+[^>]*)?>","i"),o=r.match(o)){if(this.isBlock("ahtml"))return this.setBlock(e),!1;if(void 0===o[2]||"/"!==o[2]){for(this.startBlock("ahtml",e),s=new RegExp("\\s*<("+this.blockHtmlTags+")(\\s+[^>]*)?>","ig");i=s.exec(r);)l=i[1];return 0<=r.indexOf("")?this.endBlock():n.html=l,!1}}else{if(n.html&&0<=r.indexOf(""))return this.setBlock(e).endBlock(),n.html=!1;if(this.isBlock("ahtml"))return this.setBlock(e),!1;if(o=r.match(/^\s*\s*$/))return this.startBlock("ahtml",e).endBlock(),!1}return!0},e.prototype.parseBlockMath=function(t,e,r){return r.match(/^(\s*)\$\$(\s*)$/)?(this.isBlock("math")?this.setBlock(e).endBlock():this.startBlock("math",e),!1):!this.isBlock("math")||(this.setBlock(e),!1)},e.prototype.parseBlockPre=function(t,e,r,n){return r.match(/^ {4}/)?(this.isBlock("pre")?this.setBlock(e):this.startBlock("pre",e),!1):!this.isBlock("pre")||!r.match(/^\s*$/)||(this.setBlock(e),!1)},e.prototype.parseBlockHtml=function(t,e,r,n){var s,l;return(s=r.match(new RegExp("^\\s*<("+n.special+")(\\s+[^>]*)?>","i")))?(l=s[1].toLowerCase(),this.isBlock("html",l)||this.isBlock("pre")||this.startBlock("html",e,l),!1):(s=r.match(new RegExp("\\s*$","i")))?(l=s[1].toLowerCase(),this.isBlock("html",l)&&this.setBlock(e).endBlock(),!1):!this.isBlock("html")||(this.setBlock(e),!1)},e.prototype.parseBlockFootnote=function(t,e,r){var n;return!(n=r.match(/^\[\^((?:[^\]]|\\\]|\\\[)+?)\]:/))||(r=n[0].length-1,this.startBlock("footnote",e,[r,n[1]]),!1)},e.prototype.parseBlockDefinition=function(t,e,r){return!(r=r.match(/^\s*\[((?:[^\]]|\\\]|\\\[)+?)\]:\s*(.+)$/))||(this.definitions[r[1]]=this.cleanUrl(r[2]),this.startBlock("definition",e).endBlock(),!1)},e.prototype.parseBlockQuote=function(t,e,r){return!(r=r.match(/^(\s*)>/))||(this.isBlock("list")&&0=t[3][0]?this.setBlock(e):this.startBlock("normal",e):this.isBlock("table")?0<=r.indexOf("|")?(t[3][2]+=1,this.setBlock(e,t[3])):this.startBlock("normal",e):this.isBlock("quote")?r.match(/^(\s*)$/)?this.startBlock("normal",e):this.setBlock(e):null==t||"normal"!==t[0]?this.startBlock("normal",e):this.setBlock(e),!0},e.prototype.optimizeBlocks=function(t,e){var r,n,s,l,i,o,a,c,h=t.slice(0),p=e.slice(0);for(h=this.call("beforeOptimizeBlocks",h,p),s=0;null!=h[s];)l=!1,r=h[s],o=null!=h[s-1]?h[s-1]:null,i=null!=h[s+1]?h[s+1]:null,c=r[0],n=r[1],a=r[2],"pre"===c&&p.slice(r[1],r[2]+1).reduce(function(t,e){return e.match(/^\s*$/)&&t},!0)&&(r[0]=c="normal"),"normal"===c&&(c=["list","quote"],n===a&&p[n].match(/^\s*$/)&&null!=o&&null!=i&&o[0]===i[0]&&0<=c.indexOf(o[0])&&("list"!==o[0]||o[3][0]===i[3][0]&&o[3][1]===i[3][1])&&(h[s-1]=[o[0],o[1],i[2],null!=o[3]?o[3]:null],h.splice(s,2),l=!0)),l||(s+=1);return this.call("afterOptimizeBlocks",h,p)},e.prototype.parseCode=function(t,e,r){var n,s,l,i=e[0],o=e[1];return o=$(o),n=i.length,o.match(/^[_a-z0-9-\+\#\:\.]+$/i)?1<(e=o.split(":")).length&&(o=e[0],l=e[1],o=$(o),l=$(l)):o=null,s=!0,t=t.slice(1,-1).map(function(t){return t=t.replace(new RegExp("^[ ]{"+n+"}"),""),s&&!t.match(/^\s*$/)&&(s=!1),d(t)}),r=this.markLines(t,r+1).join("\n"),s?"":"
"+r+"
"},e.prototype.parsePre=function(t,e,r){return t=t.map(function(t){return d(t.substring(4))}),(r=this.markLines(t,r).join("\n")).match(/^\s*$/)?"":"
"+r+"
"},e.prototype.parseAhtml=function(t,e,r){return $(this.markLines(t,r).join("\n"))},e.prototype.parseShtml=function(t,e,r){return $(this.markLines(t.slice(1,-1),r+1).join("\n"))},e.prototype.parseMath=function(t,e,r,n){return"

"+this.markLine(r,n)+d(t.join("\n"))+"

"},e.prototype.parseSh=function(t,e,r,n){t=this.markLine(r,n)+this.parseInline($(t[0],"# "));return t.match(/^\s*$/)?"":""+t+""},e.prototype.parseMh=function(t,e,r,n){return this.parseSh(t,e,r,n)},e.prototype.parseQuote=function(t,e,r){return(t=(t=t.map(function(t){return t.replace(/^\s*> ?/,"")})).join("\n")).match(/^\s*$/)?"":"
"+this.parse(t,!0,r)+"
"},e.prototype.parseList=function(t,e,r){for(var n,s,l,i,o,a,c="",h=e[0],p=e[1],u=e[2],f=[],k="",m=0,d=n=0,g=t.length;n"+this.parse(a.join("\n"),!0,r)+"",r+=a.length;return"<"+p+k+">"+c+""},e.prototype.parseTable=function(t,e,r){for(var n,s,l,i,o,a,c,h,p,u,f,k=e[0],m=e[1],d=0";g+="",d?g+="":B=B&&!1}return null!==B&&(g+=""),g+""},e.prototype.parseHr=function(t,e,r){return this.line?'
':"
"},e.prototype.parseNormal=function(t,e,r){var n,s=0;return t=t.map((n=this,function(t){return(t=n.parseInline(t)).match(/^\s*$/)||(t=n.markLine(r+s)+t),s+=1,t})),(t=(t=(t=$(t.join("\n"))).replace(/(\n\s*){2,}/g,function(){return e=!1,"

"})).replace(/\n/g,"
")).match(/^\s*$/)?"":e?t:"

"+t+"

"},e.prototype.parseFootnote=function(t,e){e[0];var e=e[1],e=this.footnotes.indexOf(e);return 0<=e&&((t=t.slice(0))[0]=t[0].replace(/^\[\^((?:[^\]]|\]|\[)+?)\]:/,""),this.footnotes[e]=t),""},e.prototype.parseDefinition=function(){return""},e.prototype.parseHtml=function(t,e,r){var n;return t=t.map((n=this,function(t){return n.parseInline(t,null!=n.specialWhiteList[e]?n.specialWhiteList[e]:"")})),this.markLines(t,r).join("\n")},e.prototype.cleanUrl=function(t){var e;return(e=(t=t.replace(/["'<>\s]/g,"")).match(/^(mailto:)?[_a-z0-9-\.\+]+@[_\w-]+\.[a-z]{2,}$/i))&&null==e[1]&&(t="mailto:"+t),t.match(/^\w+:/i)&&!t.match(/^(https?|mailto):/i)?"#":t},e.prototype.escapeBracket=function(t){return g(["\\[","\\]","\\(","\\)"],["[","]","(",")"],t)},e.prototype.startBlock=function(t,e,r){return null==r&&(r=null),this.pos+=1,this.current=t,this.blocks.push([t,e,e,r]),this},e.prototype.endBlock=function(){return this.current="normal",this},e.prototype.isBlock=function(t,e){return null==e&&(e=null),this.current===t&&(null===e||this.blocks[this.pos][3]===e)},e.prototype.getBlock=function(){return null!=this.blocks[this.pos]?this.blocks[this.pos]:null},e.prototype.setBlock=function(t,e){return null==t&&(t=null),null==e&&(e=null),null!==t&&(this.blocks[this.pos][2]=t),null!==e&&(this.blocks[this.pos][3]=e),this},e.prototype.backBlock=function(t,e,r){var n;return null==r&&(r=null),this.pos<0?this.startBlock(e,0,r):(n=this.blocks[this.pos][2],this.blocks[this.pos][2]=n-t,r=[e,n-t+1,n,r],this.blocks[this.pos][1]<=this.blocks[this.pos][2]?(this.pos+=1,this.blocks.push(r)):this.blocks[this.pos]=r,this.current=e,this)},e.prototype.combineBlock=function(){var t,e;return this.pos<1||(e=this.blocks[this.pos-1].slice(0),t=this.blocks[this.pos].slice(0),e[2]=t[2],this.blocks[this.pos-1]=e,this.current=e[0],this.blocks=this.blocks.slice(0,-1),--this.pos),this},t=e,"undefined"!=typeof module&&null!==module?module.exports=t:"undefined"!=typeof window&&null!==window&&(window.HyperDown=t)}).call(this); \ No newline at end of file +(function(){var t,k,r,d,c,g,$,f,B=[].slice;function e(){this.commonWhiteList="kbd|b|i|strong|em|sup|sub|br|code|del|a|hr|small",this.blockHtmlTags="p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption|svg|script|noscript",this.specialWhiteList={table:"table|tbody|thead|tfoot|tr|td|th"},this.hooks={},this.html=!1,this.line=!1,this.blockParsers=[["code",10],["shtml",20],["pre",30],["ahtml",40],["shr",50],["list",60],["math",70],["html",80],["footnote",90],["definition",100],["quote",110],["table",120],["sh",130],["mh",140],["dhr",150],["default",9999]],this.parsers={}}f=function(t){return t.charAt(0).toUpperCase()+t.substring(1)},c=function(t){return t.replace(/[-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")},g=function(t,e,n){var r,s,l,i,o,a;if(t instanceof Array)if(e instanceof Array)for(r=s=0,i=t.length;s/g,">").replace(/"/g,""")},$=function(t,e){var n,r,s,l,i;if(null==e&&(e=null),null==e)return t.replace(/^\s*/,"").replace(/\s*$/,"");for(i="",r=s=0,l=e.length-1;0<=l?s<=l:l<=s;r=0<=l?++s:--s)n=e[r],i+=c(n);return i="["+i+"]*",t.replace(new RegExp("^"+i),"").replace(new RegExp(i+"$"),"")},k=function(t){var e,n,r,s=[];if(t instanceof Array)for(n=e=0,r=t.length;e↩':(n[n.length-1]+=' ',n=1'+n+"",e+=1;t+=""}return t},e.prototype.parse=function(t,e,n){var r,s,l,i,o,a,c,h,p,u;for(null==e&&(e=!1),null==n&&(n=0),a=[],r=this.parseBlock(t,a),l="",e&&1===r.length&&"normal"===r[0][0]&&(r[0][3]=!0),i=0,o=r.length;i':""},e.prototype.markLines=function(t,e){var n,r=-1;return this.line?t.map((n=this,function(t){return r+=1,n.markLine(e+r)+t})):t},e.prototype.optimizeLines=function(t){var n=0,e=new RegExp('class="line" data\\-start="([0-9]+)" data\\-end="([0-9]+)" (data\\-id="'+this.uniqid+'")',"g");return this.line?t.replace(e,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=n!==parseInt(t[1])?'class="line" data-start="'+n+'" data-start-original="'+t[1]+'" data-end="'+t[2]+'" '+t[3]:t[0];return n=1+parseInt(t[2]),e}):t},e.prototype.parseInline=function(t,e,n,r){var s,l,i,o,a,c,h,p,u,f,k,m;return null==e&&(e=""),null==n&&(n=!0),null==r&&(r=!0),t=(t=(t=(t=(t=(t=this.call("beforeParseInline",t)).replace(/(^|[^\\])(`+)(.+?)\2/gm,(s=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+s.makeHolder(""+d(t[3])+"")}))).replace(/(^|[^\\])(\$+)(.+?)\2/gm,(l=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+l.makeHolder(t[2]+d(t[3])+t[2])}))).replace(/\\(.)/g,(i=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=t[1].match(/^[-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]$/)?"":"\\",t=d(t[1]);return t=t.replace(/\$/g,"$"),i.makeHolder(e+t)}))).replace(/<(https?:\/\/.+|(?:mailto:)?[_a-z0-9-\.\+]+@[_\w-]+\.[a-z]{2,})>/gi,(o=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=o.cleanUrl(t[1]),t=o.call("parseLink",e);return o.makeHolder(''+t+"")}))).replace(/<(\/?)([a-z0-9-]+)(\s+[^>]*)?>/gi,(a=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return a.html||0<=("|"+a.commonWhiteList+"|"+e+"|").indexOf("|"+t[2].toLowerCase()+"|")?a.makeHolder(t[0]):a.makeHolder(d(t[0]))})),this.html&&(t=t.replace(//g,(c=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return c.makeHolder(t[0])}))),t=(t=(t=(t=(t=(t=g(["<",">"],["<",">"],t)).replace(/\[\^((?:[^\]]|\\\]|\\\[)+?)\]/g,(h=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=h.footnotes.indexOf(t[1]);return e<0&&(e=h.footnotes.length+1,h.footnotes.push(h.parseInline(t[1],"",!1))),h.makeHolder(''+e+"")}))).replace(/!\[((?:[^\]]|\\\]|\\\[)*?)\]\(((?:[^\)]|\\\)|\\\()+?)\)/g,(p=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=d(p.escapeBracket(t[1])),n=p.escapeBracket(t[2]),t=p.cleanUrl(n,!0);return n=t[0],t=null==(t=t[1])?e:' title="'+t+'"',p.makeHolder(''+t+'')}))).replace(/!\[((?:[^\]]|\\\]|\\\[)*?)\]\[((?:[^\]]|\\\]|\\\[)+?)\]/g,(u=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=d(u.escapeBracket(t[1])),e=null!=u.definitions[t[2]]?''+e+'':e;return u.makeHolder(e)}))).replace(/\[((?:[^\]]|\\\]|\\\[)+?)\]\(((?:[^\)]|\\\)|\\\()+?)\)/g,(f=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=f.parseInline(f.escapeBracket(t[1]),"",!1,!1),n=f.escapeBracket(t[2]),t=f.cleanUrl(n,!0);return n=t[0],t=null==(t=t[1])?"":' title="'+t+'"',f.makeHolder('"+e+"")}))).replace(/\[((?:[^\]]|\\\]|\\\[)+?)\]\[((?:[^\]]|\\\]|\\\[)+?)\]/g,(k=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=k.parseInline(k.escapeBracket(t[1]),"",!1,!1),e=null!=k.definitions[t[2]]?''+e+"":e;return k.makeHolder(e)})),t=this.parseInlineCallback(t),r&&(t=t.replace(/(^|[^\"])(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&\/=]*)|(?:mailto:)?[_a-z0-9-\.\+]+@[_\w-]+\.[a-z]{2,})($|[^\"])/g,(m=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=m.cleanUrl(t[2]),e=m.call("parseLink",e);return t[1]+''+t[2]+""+t[5]}))),t=this.call("afterParseInlineBeforeRelease",t),t=this.releaseHolder(t,n),t=this.call("afterParseInline",t)},e.prototype.parseInlineCallback=function(t){var e,n,r,s,l,i,o;return t=(t=(t=(t=(t=(t=(t=t.replace(/(\*{3})((?:.|\r)+?)\1/gm,(e=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return""+e.parseInlineCallback(t[2])+""}))).replace(/(\*{2})((?:.|\r)+?)\1/gm,(n=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return""+n.parseInlineCallback(t[2])+""}))).replace(/(\*)((?:.|\r)+?)\1/gm,(r=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return""+r.parseInlineCallback(t[2])+""}))).replace(/(\s+|^)(_{3})((?:.|\r)+?)\2(\s+|$)/gm,(s=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+""+s.parseInlineCallback(t[3])+""+t[4]}))).replace(/(\s+|^)(_{2})((?:.|\r)+?)\2(\s+|$)/gm,(l=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+""+l.parseInlineCallback(t[3])+""+t[4]}))).replace(/(\s+|^)(_)((?:.|\r)+?)\2(\s+|$)/gm,(i=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+""+i.parseInlineCallback(t[3])+""+t[4]}))).replace(/(~{2})((?:.|\r)+?)\1/gm,(o=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return""+o.parseInlineCallback(t[2])+""}))},e.prototype.parseBlock=function(t,e){for(var n,r,s,l,i,o,a,c,h,p=t.split("\n"),u=0,f=p.length;u=t[3][0]+r.empty)return r.empty=0,this.setBlock(e),!1;if(n.match(/^\s*$/)&&0===r.empty)return r.empty+=1,this.setBlock(e),!1}return!(l=n.match(/^(\s*)((?:[0-9]+\.)|\-|\+|\*)\s+/i))||(s=l[1].length,n=l[0].length-s,l=(r.empty=0)<="+-*".indexOf(l[2])?"ul":"ol",!this.isBlock("list")||s=t+r.empty),r.code=n[2],this.startBlock("code",e,[n[1],n[3],s]);return!1}return!this.isBlock("code")||(this.setBlock(e),!1)},e.prototype.parseBlockShtml=function(t,e,n,r){if(this.html){if(n.match(/^(\s*)!!!(\s*)$/))return this.isBlock("shtml")?this.setBlock(e).endBlock():this.startBlock("shtml",e),!1;if(this.isBlock("shtml"))return this.setBlock(e),!1}return!0},e.prototype.parseBlockAhtml=function(t,e,n,r){var s,l,i,o;if(this.html)if(o=new RegExp("^\\s*<("+this.blockHtmlTags+")(\\s+[^>]*)?>","i"),o=n.match(o)){if(this.isBlock("ahtml"))return this.setBlock(e),!1;if(void 0===o[2]||"/"!==o[2]){for(this.startBlock("ahtml",e),s=new RegExp("\\s*<("+this.blockHtmlTags+")(\\s+[^>]*)?>","ig");i=s.exec(n);)l=i[1];return 0<=n.indexOf("")?this.endBlock():r.html=l,!1}}else{if(r.html&&0<=n.indexOf(""))return this.setBlock(e).endBlock(),r.html=!1;if(this.isBlock("ahtml"))return this.setBlock(e),!1;if(o=n.match(/^\s*\s*$/))return this.startBlock("ahtml",e).endBlock(),!1}return!0},e.prototype.parseBlockMath=function(t,e,n){return n.match(/^(\s*)\$\$(\s*)$/)?(this.isBlock("math")?this.setBlock(e).endBlock():this.startBlock("math",e),!1):!this.isBlock("math")||(this.setBlock(e),!1)},e.prototype.parseBlockPre=function(t,e,n,r){return n.match(/^ {4}/)?(this.isBlock("pre")?this.setBlock(e):this.startBlock("pre",e),!1):!this.isBlock("pre")||!n.match(/^\s*$/)||(this.setBlock(e),!1)},e.prototype.parseBlockHtml=function(t,e,n,r){var s,l;return(s=n.match(new RegExp("^\\s*<("+r.special+")(\\s+[^>]*)?>","i")))?(l=s[1].toLowerCase(),this.isBlock("html",l)||this.isBlock("pre")||this.startBlock("html",e,l),!1):(s=n.match(new RegExp("\\s*$","i")))?(l=s[1].toLowerCase(),this.isBlock("html",l)&&this.setBlock(e).endBlock(),!1):!this.isBlock("html")||(this.setBlock(e),!1)},e.prototype.parseBlockFootnote=function(t,e,n){var r;return!(r=n.match(/^\[\^((?:[^\]]|\\\]|\\\[)+?)\]:/))||(n=r[0].length-1,this.startBlock("footnote",e,[n,r[1]]),!1)},e.prototype.parseBlockDefinition=function(t,e,n){return!(n=n.match(/^\s*\[((?:[^\]]|\\\]|\\\[)+?)\]:\s*(.+)$/))||(this.definitions[n[1]]=this.cleanUrl(n[2]),this.startBlock("definition",e).endBlock(),!1)},e.prototype.parseBlockQuote=function(t,e,n){return!(n=n.match(/^(\s*)>/))||(this.isBlock("list")&&0=t[3][0]?this.setBlock(e):this.startBlock("normal",e):this.isBlock("table")?0<=n.indexOf("|")?(t[3][2]+=1,this.setBlock(e,t[3])):this.startBlock("normal",e):this.isBlock("quote")?n.match(/^(\s*)$/)?this.startBlock("normal",e):this.setBlock(e):null==t||"normal"!==t[0]?this.startBlock("normal",e):this.setBlock(e),!0},e.prototype.optimizeBlocks=function(t,e){var n,r,s,l,i,o,a,c,h=t.slice(0),p=e.slice(0);for(h=this.call("beforeOptimizeBlocks",h,p),s=0;null!=h[s];)l=!1,n=h[s],o=null!=h[s-1]?h[s-1]:null,i=null!=h[s+1]?h[s+1]:null,c=n[0],r=n[1],a=n[2],"pre"===c&&p.slice(n[1],n[2]+1).reduce(function(t,e){return e.match(/^\s*$/)&&t},!0)&&(n[0]=c="normal"),"normal"===c&&(c=["list","quote"],r===a&&p[r].match(/^\s*$/)&&null!=o&&null!=i&&o[0]===i[0]&&0<=c.indexOf(o[0])&&("list"!==o[0]||o[3][0]===i[3][0]&&o[3][1]===i[3][1])&&(h[s-1]=[o[0],o[1],i[2],null!=o[3]?o[3]:null],h.splice(s,2),l=!0)),l||(s+=1);return this.call("afterOptimizeBlocks",h,p)},e.prototype.parseCode=function(t,e,n){var r,s,l,i=e[0],o=e[1];return o=$(o),r=i.length,o.match(/^[_a-z0-9-\+\#\:\.]+$/i)?1<(e=o.split(":")).length&&(o=e[0],l=e[1],o=$(o),l=$(l)):o=null,s=!0,t=t.slice(1,-1).map(function(t){return t=t.replace(new RegExp("^[ ]{"+r+"}"),""),s&&!t.match(/^\s*$/)&&(s=!1),d(t)}),n=this.markLines(t,n+1).join("\n"),s?"":"
"+n+"
"},e.prototype.parsePre=function(t,e,n){return t=t.map(function(t){return d(t.substring(4))}),(n=this.markLines(t,n).join("\n")).match(/^\s*$/)?"":"
"+n+"
"},e.prototype.parseAhtml=function(t,e,n){return $(this.markLines(t,n).join("\n"))},e.prototype.parseShtml=function(t,e,n){return $(this.markLines(t.slice(1,-1),n+1).join("\n"))},e.prototype.parseMath=function(t,e,n,r){return"

"+this.markLine(n,r)+d(t.join("\n"))+"

"},e.prototype.parseSh=function(t,e,n,r){t=this.markLine(n,r)+this.parseInline($(t[0],"# "));return t.match(/^\s*$/)?"":""+t+""},e.prototype.parseMh=function(t,e,n,r){return this.parseSh(t,e,n,r)},e.prototype.parseQuote=function(t,e,n){return(t=(t=t.map(function(t){return t.replace(/^\s*> ?/,"")})).join("\n")).match(/^\s*$/)?"":"
"+this.parse(t,!0,n)+"
"},e.prototype.parseList=function(t,e,n){for(var r,s,l,i,o,a,c="",h=e[0],p=e[1],u=e[2],f=[],k="",m=0,d=r=0,g=t.length;r"+this.parse(a.join("\n"),!0,n)+"",n+=a.length;return"<"+p+k+">"+c+""},e.prototype.parseTable=function(t,e,n){for(var r,s,l,i,o,a,c,h,p,u,f,k=e[0],m=e[1],d=0";g+="",d?g+="":B=B&&!1}return null!==B&&(g+=""),g+""},e.prototype.parseHr=function(t,e,n){return this.line?'
':"
"},e.prototype.parseNormal=function(t,e,n){var r,s=0;return t=t.map((r=this,function(t){return(t=r.parseInline(t)).match(/^\s*$/)||(t=r.markLine(n+s)+t),s+=1,t})),(t=(t=(t=$(t.join("\n"))).replace(/(\n\s*){2,}/g,function(){return e=!1,"

"})).replace(/\n/g,"
")).match(/^\s*$/)?"":e?t:"

"+t+"

"},e.prototype.parseFootnote=function(t,e){e[0];var e=e[1],e=this.footnotes.indexOf(e);return 0<=e&&((t=t.slice(0))[0]=t[0].replace(/^\[\^((?:[^\]]|\]|\[)+?)\]:/,""),this.footnotes[e]=t),""},e.prototype.parseDefinition=function(){return""},e.prototype.parseHtml=function(t,e,n){var r;return t=t.map((r=this,function(t){return r.parseInline(t,null!=r.specialWhiteList[e]?r.specialWhiteList[e]:"")})),this.markLines(t,n).join("\n")},e.prototype.cleanUrl=function(t,e){var n,r;return null==e&&(e=!1),r=null,e&&0<(n=t.indexOf(" "))&&(r=d($(t.substring(n+1)," \"'")),t=t.substring(0,n)),(n=(t=t.replace(/["'<>\s]/g,"")).match(/^(mailto:)?[_a-z0-9-\.\+]+@[_\w-]+\.[a-z]{2,}$/i))&&null==n[1]&&(t="mailto:"+t),t.match(/^\w+:/i)&&!t.match(/^(https?|mailto):/i)?"#":e?[t,r]:t},e.prototype.escapeBracket=function(t){return g(["\\[","\\]","\\(","\\)"],["[","]","(",")"],t)},e.prototype.startBlock=function(t,e,n){return null==n&&(n=null),this.pos+=1,this.current=t,this.blocks.push([t,e,e,n]),this},e.prototype.endBlock=function(){return this.current="normal",this},e.prototype.isBlock=function(t,e){return null==e&&(e=null),this.current===t&&(null===e||this.blocks[this.pos][3]===e)},e.prototype.getBlock=function(){return null!=this.blocks[this.pos]?this.blocks[this.pos]:null},e.prototype.setBlock=function(t,e){return null==t&&(t=null),null==e&&(e=null),null!==t&&(this.blocks[this.pos][2]=t),null!==e&&(this.blocks[this.pos][3]=e),this},e.prototype.backBlock=function(t,e,n){var r;return null==n&&(n=null),this.pos<0?this.startBlock(e,0,n):(r=this.blocks[this.pos][2],this.blocks[this.pos][2]=r-t,n=[e,r-t+1,r,n],this.blocks[this.pos][1]<=this.blocks[this.pos][2]?(this.pos+=1,this.blocks.push(n)):this.blocks[this.pos]=n,this.current=e,this)},e.prototype.combineBlock=function(){var t,e;return this.pos<1||(e=this.blocks[this.pos-1].slice(0),t=this.blocks[this.pos].slice(0),e[2]=t[2],this.blocks[this.pos-1]=e,this.current=e[0],this.blocks=this.blocks.slice(0,-1),--this.pos),this},t=e,"undefined"!=typeof module&&null!==module?module.exports=t:"undefined"!=typeof window&&null!==window&&(window.HyperDown=t)}).call(this); \ No newline at end of file diff --git a/admin/src/js/hyperdown.js b/admin/src/js/hyperdown.js index d3db057f..841c82fc 100644 --- a/admin/src/js/hyperdown.js +++ b/admin/src/js/hyperdown.js @@ -367,12 +367,13 @@ })(this)); text = text.replace(/!\[((?:[^\]]|\\\]|\\\[)*?)\]\(((?:[^\)]|\\\)|\\\()+?)\)/g, (function(_this) { return function() { - var escaped, matches, url; + var escaped, matches, ref, title, url; matches = 1 <= arguments.length ? slice.call(arguments, 0) : []; escaped = htmlspecialchars(_this.escapeBracket(matches[1])); url = _this.escapeBracket(matches[2]); - url = _this.cleanUrl(url); - return _this.makeHolder("\"""); + ref = _this.cleanUrl(url, true), url = ref[0], title = ref[1]; + title = title == null ? escaped : " title=\"" + title + "\""; + return _this.makeHolder("\"""); }; })(this)); text = text.replace(/!\[((?:[^\]]|\\\]|\\\[)*?)\]\[((?:[^\]]|\\\]|\\\[)+?)\]/g, (function(_this) { @@ -386,12 +387,13 @@ })(this)); text = text.replace(/\[((?:[^\]]|\\\]|\\\[)+?)\]\(((?:[^\)]|\\\)|\\\()+?)\)/g, (function(_this) { return function() { - var escaped, matches, url; + var escaped, matches, ref, title, url; matches = 1 <= arguments.length ? slice.call(arguments, 0) : []; escaped = _this.parseInline(_this.escapeBracket(matches[1]), '', false, false); url = _this.escapeBracket(matches[2]); - url = _this.cleanUrl(url); - return _this.makeHolder("" + escaped + ""); + ref = _this.cleanUrl(url, true), url = ref[0], title = ref[1]; + title = title == null ? '' : " title=\"" + title + "\""; + return _this.makeHolder("" + escaped + ""); }; })(this)); text = text.replace(/\[((?:[^\]]|\\\]|\\\[)+?)\]\[((?:[^\]]|\\\]|\\\[)+?)\]/g, (function(_this) { @@ -1137,8 +1139,19 @@ return (this.markLines(lines, start)).join("\n"); }; - Parser.prototype.cleanUrl = function(url) { - var matches; + Parser.prototype.cleanUrl = function(url, parseTitle) { + var matches, pos, title; + if (parseTitle == null) { + parseTitle = false; + } + title = null; + if (parseTitle) { + pos = url.indexOf(' '); + if (pos > 0) { + title = htmlspecialchars(trim(url.substring(pos + 1), ' "\'')); + url = url.substring(0, pos); + } + } url = url.replace(/["'<>\s]/g, ''); if (!!(matches = url.match(/^(mailto:)?[_a-z0-9-\.\+]+@[_\w-]+\.[a-z]{2,}$/i))) { if (matches[1] == null) { @@ -1148,7 +1161,11 @@ if ((url.match(/^\w+:/i)) && !(url.match(/^(https?|mailto):/i))) { return '#'; } - return url; + if (parseTitle) { + return [url, title]; + } else { + return url; + } }; Parser.prototype.escapeBracket = function(str) { diff --git a/var/HyperDown.php b/var/HyperDown.php index d9d2de8c..67bf7fba 100644 --- a/var/HyperDown.php +++ b/var/HyperDown.php @@ -385,8 +385,8 @@ class HyperDown "/(^|[^\\\])(`+)(.+?)\\2/", function ($matches) use ($self) { return $matches[1] . $self->makeHolder( - '' . htmlspecialchars($matches[3]) . '' - ); + '' . htmlspecialchars($matches[3]) . '' + ); }, $text ); @@ -396,8 +396,8 @@ class HyperDown "/(^|[^\\\])(\\$+)(.+?)\\2/", function ($matches) use ($self) { return $matches[1] . $self->makeHolder( - $matches[2] . htmlspecialchars($matches[3]) . $matches[2] - ); + $matches[2] . htmlspecialchars($matches[3]) . $matches[2] + ); }, $text ); @@ -433,8 +433,8 @@ class HyperDown "/<(\/?)([a-z0-9-]+)(\s+[^>]*)?>/i", function ($matches) use ($self, $whiteList) { if ($self->_html || false !== stripos( - '|' . $self->_commonWhiteList . '|' . $whiteList . '|', '|' . $matches[2] . '|' - )) { + '|' . $self->_commonWhiteList . '|' . $whiteList . '|', '|' . $matches[2] . '|' + )) { return $self->makeHolder($matches[0]); } else { return $self->makeHolder(htmlspecialchars($matches[0])); @@ -475,9 +475,11 @@ class HyperDown function ($matches) use ($self) { $escaped = htmlspecialchars($self->escapeBracket($matches[1])); $url = $self->escapeBracket($matches[2]); - $url = $self->cleanUrl($url); + list ($url, $title) = $self->cleanUrl($url, true); + $title = empty($title)? $escaped : " title=\"{$title}\""; + return $self->makeHolder( - "\"{$escaped}\"" + "\"{$title}\"" ); }, $text @@ -505,8 +507,10 @@ class HyperDown $self->escapeBracket($matches[1]), '', false, false ); $url = $self->escapeBracket($matches[2]); - $url = $self->cleanUrl($url); - return $self->makeHolder("{$escaped}"); + list ($url, $title) = $self->cleanUrl($url, true); + $title = empty($title) ? '' : " title=\"{$title}\""; + + return $self->makeHolder("{$escaped}"); }, $text ); @@ -1088,7 +1092,7 @@ class HyperDown private function parseBlockMh($block, $key, $line, &$state, $lines) { if (preg_match("/^\s*((=|-){2,})\s*$/", $line, $matches) - && ($block && $block[0] == "normal" && !preg_match("/^\s*$/", $lines[$block[2]]))) { // check if last line isn't empty + && ($block && $block[0] == "normal" && !preg_match("/^\s*$/", $lines[$block[2]]))) { // check if last line isn't empty if ($this->isBlock('normal')) { $this->backBlock(1, 'mh', $matches[1][0] == '=' ? 1 : 2) ->setBlock($key) @@ -1624,10 +1628,23 @@ class HyperDown /** * @param $url - * @return string + * @param bool $parseTitle + * + * @return mixed */ - public function cleanUrl($url) + public function cleanUrl($url, $parseTitle = false) { + $title = null; + + if ($parseTitle) { + $pos = strpos($url, ' '); + + if ($pos !== false) { + $title = htmlspecialchars(trim(substr($url, $pos + 1), ' "\'')); + $url = substr($url, 0, $pos); + } + } + $url = preg_replace("/[\"'<>\s]/", '', $url); if (preg_match("/^(mailto:)?[_a-z0-9-\.\+]+@[_\w-]+\.[a-z]{2,}$/i", $url, $matches)) { @@ -1640,7 +1657,7 @@ class HyperDown return '#'; } - return $url; + return $parseTitle ? [$url, $title] : $url; } /**