From 50c23c44c5ede3301af8827ab1b6c5cff3ffca06 Mon Sep 17 00:00:00 2001 From: joyqi Date: Fri, 18 Jun 2021 16:52:59 +0800 Subject: [PATCH] update hyperdown --- .github/workflows/Typecho-dev-Ci.yml | 8 +++++++- admin/js/hyperdown.js | 2 +- admin/src/js/hyperdown.js | 8 ++++---- var/HyperDown.php | 8 ++++---- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Typecho-dev-Ci.yml b/.github/workflows/Typecho-dev-Ci.yml index 1485792c..4291a589 100644 --- a/.github/workflows/Typecho-dev-Ci.yml +++ b/.github/workflows/Typecho-dev-Ci.yml @@ -1,6 +1,12 @@ name: Typecho Build Dev Ci -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: + branches: + - master jobs: php: diff --git a/admin/js/hyperdown.js b/admin/js/hyperdown.js index f65167f4..bf86b815 100644 --- a/admin/js/hyperdown.js +++ b/admin/js/hyperdown.js @@ -1 +1 @@ -(function(){var t,k,s,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 s,n,l,i,o,a;if(t instanceof Array)if(e instanceof Array)for(s=n=0,i=t.length;n/g,">").replace(/"/g,""")},$=function(t,e){var r,s,n,l,i;if(null==e&&(e=null),null==e)return t.replace(/^\s*/,"").replace(/\s*$/,"");for(i="",s=n=0,l=e.length-1;0<=l?n<=l:l<=n;s=0<=l?++n:--n)r=e[s],i+=c(r);return i="["+i+"]*",t.replace(new RegExp("^"+i),"").replace(new RegExp(i+"$"),"")},k=function(t){var e,r,s,n=[];if(t instanceof Array)for(r=e=0,s=t.length;e↩':(r[r.length-1]+=' ',r=1'+r+"",e+=1;t+=""}return t},e.prototype.parse=function(t,e,r){var s,n,l,i,o,a,c,h,p,u;for(null==e&&(e=!1),null==r&&(r=0),a=[],s=this.parseBlock(t,a),l="",e&&1===s.length&&"normal"===s[0][0]&&(s[0][3]=!0),i=0,o=s.length;i':""},e.prototype.markLines=function(t,e){var r,s=-1;return this.line?t.map((r=this,function(t){return s+=1,r.markLine(e+s)+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,s){var n,l,i,o,a,c,h,p,u,f,k,m;return null==e&&(e=""),null==r&&(r=!0),null==s&&(s=!0),t=(t=(t=(t=(t=(t=this.call("beforeParseInline",t)).replace(/(^|[^\\])(`+)(.+?)\2/gm,(n=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+n.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?:\/\/.+)>/gi,(o=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=o.cleanUrl(t[1]),t=o.call("parseLink",t[1]);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=(t=this.parseInlineCallback(t)).replace(/<([_a-z0-9-\.\+]+@[^@]+\.[a-z]{2,})>/gi,'$1'),s&&(t=t.replace(/(^|[^\"])((https?):\S+)($|[^\"])/gi,(m=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=m.call("parseLink",t[2]);return t[1]+''+e+""+t[4]}))),t=this.call("afterParseInlineBeforeRelease",t),t=this.releaseHolder(t,r),t=this.call("afterParseInline",t)},e.prototype.parseInlineCallback=function(t){var e,r,s,n,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,(s=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return""+s.parseInlineCallback(t[2])+""}))).replace(/(\s+|^)(_{3})((?:.|\r)+?)\2(\s+|$)/gm,(n=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+""+n.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,s,n,l,i,o,a,c,h,p=t.split("\n"),u=0,f=p.length;u=t[3][0]+s.empty)return s.empty=0,this.setBlock(e),!1;if(r.match(/^\s*$/)&&0===s.empty)return s.empty+=1,this.setBlock(e),!1}return!(l=r.match(/^(\s*)((?:[0-9]+\.)|\-|\+|\*)\s+/i))||(n=l[1].length,r=l[0].length-n,l=(s.empty=0)<="+-*".indexOf(l[2])?"ul":"ol",!this.isBlock("list")||n=t+s.empty),s.code=r[2],this.startBlock("code",e,[r[1],r[3],n]);return!1}return!this.isBlock("code")||(this.setBlock(e),!1)},e.prototype.parseBlockShtml=function(t,e,r,s){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,s){var n,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),n=new RegExp("\\s*<("+this.blockHtmlTags+")(\\s+[^>]*)?>","ig");i=n.exec(r);)l=i[1];return 0<=r.indexOf("")?this.endBlock():s.html=l,!1}}else{if(s.html&&0<=r.indexOf(""))return this.setBlock(e).endBlock(),s.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,s){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,s){var n,l;return(n=r.match(new RegExp("^\\s*<("+s.special+")(\\s+[^>]*)?>","i")))?(l=n[1].toLowerCase(),this.isBlock("html",l)||this.isBlock("pre")||this.startBlock("html",e,l),!1):(n=r.match(new RegExp("\\s*$","i")))?(l=n[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 s;return!(s=r.match(/^\[\^((?:[^\]]|\\\]|\\\[)+?)\]:/))||(r=s[0].length-1,this.startBlock("footnote",e,[r,s[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,s,n,l,i,o,a,c,h=t.slice(0),p=e.slice(0);for(h=this.call("beforeOptimizeBlocks",h,p),n=0;null!=h[n];)l=!1,r=h[n],o=null!=h[n-1]?h[n-1]:null,i=null!=h[n+1]?h[n+1]:null,c=r[0],s=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"],s===a&&p[s].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[n-1]=[o[0],o[1],i[2],null!=o[3]?o[3]:null],h.splice(n,2),l=!0)),l||(n+=1);return this.call("afterOptimizeBlocks",h,p)},e.prototype.parseCode=function(t,e,r){var s,n,l,i=e[0],o=e[1];return o=$(o),s=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,n=!0,t=t.slice(1,-1).map(function(t){return t=t.replace(new RegExp("^[ ]{"+s+"}"),""),n&&!t.match(/^\s*$/)&&(n=!1),d(t)}),r=this.markLines(t,r+1).join("\n"),n?"":"
"+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,s){return"

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

"},e.prototype.parseSh=function(t,e,r,s){t=this.markLine(r,s)+this.parseInline($(t[0],"# "));return t.match(/^\s*$/)?"":""+t+""},e.prototype.parseMh=function(t,e,r,s){return this.parseSh(t,e,r,s)},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 s,n,l,i,o,a,c="",h=e[0],p=e[1],u=e[2],f=[],k="",m=0,d=s=0,g=t.length;s"+this.parse(a.join("\n"),!0,r)+"",r+=a.length;return"<"+p+k+">"+c+""},e.prototype.parseTable=function(t,e,r){for(var s,n,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 s,n=0;return t=t.map((s=this,function(t){return(t=s.parseInline(t)).match(/^\s*$/)||(t=s.markLine(r+n)+t),n+=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 s;return t=t.map((s=this,function(t){return s.parseInline(t,null!=s.specialWhiteList[e]?s.specialWhiteList[e]:"")})),this.markLines(t,r).join("\n")},e.prototype.cleanUrl=function(t){var e;return(e=t.match(/^\s*((http|https|ftp|mailto):\S+)/i))||(e=t.match(/^\s*(\S+)/))?e[1]:"#"},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 s;return null==r&&(r=null),this.pos<0?this.startBlock(e,0,r):(s=this.blocks[this.pos][2],this.blocks[this.pos][2]=s-t,r=[e,s-t+1,s,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,s,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 s,n,l,i,o,a;if(t instanceof Array)if(e instanceof Array)for(s=n=0,i=t.length;n/g,">").replace(/"/g,""")},$=function(t,e){var r,s,n,l,i;if(null==e&&(e=null),null==e)return t.replace(/^\s*/,"").replace(/\s*$/,"");for(i="",s=n=0,l=e.length-1;0<=l?n<=l:l<=n;s=0<=l?++n:--n)r=e[s],i+=c(r);return i="["+i+"]*",t.replace(new RegExp("^"+i),"").replace(new RegExp(i+"$"),"")},k=function(t){var e,r,s,n=[];if(t instanceof Array)for(r=e=0,s=t.length;e↩':(r[r.length-1]+=' ',r=1'+r+"",e+=1;t+=""}return t},e.prototype.parse=function(t,e,r){var s,n,l,i,o,a,c,h,p,u;for(null==e&&(e=!1),null==r&&(r=0),a=[],s=this.parseBlock(t,a),l="",e&&1===s.length&&"normal"===s[0][0]&&(s[0][3]=!0),i=0,o=s.length;i':""},e.prototype.markLines=function(t,e){var r,s=-1;return this.line?t.map((r=this,function(t){return s+=1,r.markLine(e+s)+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,s){var n,l,i,o,a,c,h,p,u,f,k,m;return null==e&&(e=""),null==r&&(r=!0),null==s&&(s=!0),t=(t=(t=(t=(t=(t=this.call("beforeParseInline",t)).replace(/(^|[^\\])(`+)(.+?)\2/gm,(n=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+n.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?:\/\/.+)>/gi,(o=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=o.cleanUrl(t[1]),t=o.call("parseLink",t[1]);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=(t=this.parseInlineCallback(t)).replace(/<([_a-z0-9-\.\+]+@[^@]+\.[a-z]{2,})>/gi,'$1'),s&&(t=t.replace(/(^|[^\"])(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&\/=]*))($|[^\"])/g,(m=this,function(){var t=1<=arguments.length?B.call(arguments,0):[],e=m.call("parseLink",t[2]);return t[1]+''+e+""+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,s,n,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,(s=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return""+s.parseInlineCallback(t[2])+""}))).replace(/(\s+|^)(_{3})((?:.|\r)+?)\2(\s+|$)/gm,(n=this,function(){var t=1<=arguments.length?B.call(arguments,0):[];return t[1]+""+n.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,s,n,l,i,o,a,c,h,p=t.split("\n"),u=0,f=p.length;u=t[3][0]+s.empty)return s.empty=0,this.setBlock(e),!1;if(r.match(/^\s*$/)&&0===s.empty)return s.empty+=1,this.setBlock(e),!1}return!(l=r.match(/^(\s*)((?:[0-9]+\.)|\-|\+|\*)\s+/i))||(n=l[1].length,r=l[0].length-n,l=(s.empty=0)<="+-*".indexOf(l[2])?"ul":"ol",!this.isBlock("list")||n=t+s.empty),s.code=r[2],this.startBlock("code",e,[r[1],r[3],n]);return!1}return!this.isBlock("code")||(this.setBlock(e),!1)},e.prototype.parseBlockShtml=function(t,e,r,s){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,s){var n,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),n=new RegExp("\\s*<("+this.blockHtmlTags+")(\\s+[^>]*)?>","ig");i=n.exec(r);)l=i[1];return 0<=r.indexOf("")?this.endBlock():s.html=l,!1}}else{if(s.html&&0<=r.indexOf(""))return this.setBlock(e).endBlock(),s.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,s){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,s){var n,l;return(n=r.match(new RegExp("^\\s*<("+s.special+")(\\s+[^>]*)?>","i")))?(l=n[1].toLowerCase(),this.isBlock("html",l)||this.isBlock("pre")||this.startBlock("html",e,l),!1):(n=r.match(new RegExp("\\s*$","i")))?(l=n[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 s;return!(s=r.match(/^\[\^((?:[^\]]|\\\]|\\\[)+?)\]:/))||(r=s[0].length-1,this.startBlock("footnote",e,[r,s[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,s,n,l,i,o,a,c,h=t.slice(0),p=e.slice(0);for(h=this.call("beforeOptimizeBlocks",h,p),n=0;null!=h[n];)l=!1,r=h[n],o=null!=h[n-1]?h[n-1]:null,i=null!=h[n+1]?h[n+1]:null,c=r[0],s=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"],s===a&&p[s].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[n-1]=[o[0],o[1],i[2],null!=o[3]?o[3]:null],h.splice(n,2),l=!0)),l||(n+=1);return this.call("afterOptimizeBlocks",h,p)},e.prototype.parseCode=function(t,e,r){var s,n,l,i=e[0],o=e[1];return o=$(o),s=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,n=!0,t=t.slice(1,-1).map(function(t){return t=t.replace(new RegExp("^[ ]{"+s+"}"),""),n&&!t.match(/^\s*$/)&&(n=!1),d(t)}),r=this.markLines(t,r+1).join("\n"),n?"":"
"+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,s){return"

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

"},e.prototype.parseSh=function(t,e,r,s){t=this.markLine(r,s)+this.parseInline($(t[0],"# "));return t.match(/^\s*$/)?"":""+t+""},e.prototype.parseMh=function(t,e,r,s){return this.parseSh(t,e,r,s)},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 s,n,l,i,o,a,c="",h=e[0],p=e[1],u=e[2],f=[],k="",m=0,d=s=0,g=t.length;s"+this.parse(a.join("\n"),!0,r)+"",r+=a.length;return"<"+p+k+">"+c+""},e.prototype.parseTable=function(t,e,r){for(var s,n,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 s,n=0;return t=t.map((s=this,function(t){return(t=s.parseInline(t)).match(/^\s*$/)||(t=s.markLine(r+n)+t),n+=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 s;return t=t.map((s=this,function(t){return s.parseInline(t,null!=s.specialWhiteList[e]?s.specialWhiteList[e]:"")})),this.markLines(t,r).join("\n")},e.prototype.cleanUrl=function(t){var e;return(e=t.match(/^\s*(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&\/=]*))/))||(e=t.match(/^\s*([-a-zA-Z0-9()@:%_\+.~#?&\/=]+)/))?e[1]:"#"},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 s;return null==r&&(r=null),this.pos<0?this.startBlock(e,0,r):(s=this.blocks[this.pos][2],this.blocks[this.pos][2]=s-t,r=[e,s-t+1,s,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 diff --git a/admin/src/js/hyperdown.js b/admin/src/js/hyperdown.js index 4c8873a2..16e2faa3 100644 --- a/admin/src/js/hyperdown.js +++ b/admin/src/js/hyperdown.js @@ -406,12 +406,12 @@ text = this.parseInlineCallback(text); text = text.replace(/<([_a-z0-9-\.\+]+@[^@]+\.[a-z]{2,})>/ig, '$1'); if (enableAutoLink) { - text = text.replace(/(^|[^\"])((https?):\S+)($|[^\"])/ig, (function(_this) { + text = text.replace(/(^|[^\"])(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&\/=]*))($|[^\"])/g, (function(_this) { return function() { var link, matches; matches = 1 <= arguments.length ? slice.call(arguments, 0) : []; link = _this.call('parseLink', matches[2]); - return matches[1] + "" + link + "" + matches[4]; + return matches[1] + "" + link + "" + matches[5]; }; })(this)); } @@ -1139,9 +1139,9 @@ Parser.prototype.cleanUrl = function(url) { var matches; - if (!!(matches = url.match(/^\s*((http|https|ftp|mailto):\S+)/i))) { + if (!!(matches = url.match(/^\s*(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&\/=]*))/))) { return matches[1]; - } else if (!!(matches = url.match(/^\s*(\S+)/))) { + } else if (!!(matches = url.match(/^\s*([-a-zA-Z0-9()@:%_\+.~#?&\/=]+)/))) { return matches[1]; } else { return '#'; diff --git a/var/HyperDown.php b/var/HyperDown.php index 28803aed..cc1bfa2f 100644 --- a/var/HyperDown.php +++ b/var/HyperDown.php @@ -537,10 +537,10 @@ class HyperDown // autolink url if ($enableAutoLink) { $text = preg_replace_callback( - "/(^|[^\"])((https?):\S+)($|[^\"])/i", + "/(^|[^\"])(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&\/=]*))($|[^\"])/", function ($matches) use ($self) { $link = $self->call('parseLink', $matches[2]); - return "{$matches[1]}{$link}{$matches[4]}"; + return "{$matches[1]}{$link}{$matches[5]}"; }, $text ); @@ -1627,9 +1627,9 @@ class HyperDown */ public function cleanUrl($url) { - if (preg_match("/^\s*((http|https|ftp|mailto):\S+)/i", $url, $matches)) { + if (preg_match("/^\s*(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&\/=]*))/", $url, $matches)) { return $matches[1]; - } elseif (preg_match("/^\s*(\S+)/i", $url, $matches)) { + } elseif (preg_match("/^\s*([-a-zA-Z0-9()@:%_\+.~#?&\/=]+)/", $url, $matches)) { return $matches[1]; } else { return '#';