From 6164d92173294dc5d60985d3dd13f1d1255af7bf Mon Sep 17 00:00:00 2001
From: joyqi "+this.markLine(r,n)+d(t.join("\n"))+"
"}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"+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('')}))).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;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'),n&&(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,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
"},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""+r+""+this.parse(t,!0,r)+"
"},e.prototype.parseList=function(t,e,r){for(var n,s,l,i,o,a="",c=e[0],e=e[1],h=[],p=0,u=0,f=t.length;u",n)c=(u=n[y])[0],f=u[1],g+="<"+(u=d?"th":"td"),1 ",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.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 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,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"+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('"+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*$/)?"":""+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
"})).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 diff --git a/admin/src/js/hyperdown.js b/admin/src/js/hyperdown.js index 58d9ffba..4c8873a2 100644 --- a/admin/src/js/hyperdown.js +++ b/admin/src/js/hyperdown.js @@ -516,7 +516,7 @@ }; Parser.prototype.parseBlockList = function(block, key, line, state) { - var matches, space, type; + var matches, space, tab, type; if ((this.isBlock('list')) && !line.match(/^\s*\[((?:[^\]]|\\\]|\\\[)+?)\]:\s*(.+)$/)) { if (!!(line.match(/^(\s*)(~{3,}|`{3,})([^`~]*)$/i))) { return true; @@ -532,16 +532,17 @@ } if (!!(matches = line.match(/^(\s*)((?:[0-9]+\.)|\-|\+|\*)\s+/i))) { space = matches[1].length; + tab = matches[0].length - space; state.empty = 0; type = 0 <= '+-*'.indexOf(matches[2]) ? 'ul' : 'ol'; if (this.isBlock('list')) { if (space < block[3][0] || (space === block[3][0] && type !== block[3][1])) { - this.startBlock('list', key, [space, type]); + this.startBlock('list', key, [space, type, tab]); } else { this.setBlock(key); } } else { - this.startBlock('list', key, [space, type]); + this.startBlock('list', key, [space, type, tab]); } return false; } @@ -552,6 +553,10 @@ var isAfterList, matches, space; if (!!(matches = line.match(/^(\s*)(~{3,}|`{3,})([^`~]*)$/i))) { if (this.isBlock('code')) { + if (state.code !== matches[2]) { + this.setBlock(key); + return false; + } isAfterList = block[3][2]; if (isAfterList) { this.combineBlock().setBlock(key); @@ -564,6 +569,7 @@ space = block[3][0]; isAfterList = matches[1].length >= space + state.empty; } + state.code = matches[2]; this.startBlock('code', key, [matches[1], matches[3], isAfterList]); } return false; @@ -888,7 +894,7 @@ } isEmpty = true; lines = lines.slice(1, -1).map(function(line) { - line = line.replace(new RegExp("/^[ ]{" + count + "}/"), ''); + line = line.replace(new RegExp("^[ ]{" + count + "}"), ''); if (isEmpty && !line.match(/^\s*$/)) { isEmpty = false; } @@ -955,18 +961,25 @@ }; Parser.prototype.parseList = function(lines, value, start) { - var html, j, l, last, len, len1, line, matches, row, rows, space, type; + var html, j, key, l, last, len, len1, line, matches, row, rows, space, suffix, tab, type; html = ''; - space = value[0], type = value[1]; + space = value[0], type = value[1], tab = value[2]; rows = []; + suffix = ''; last = 0; - for (j = 0, len = lines.length; j < len; j++) { - line = lines[j]; + for (key = j = 0, len = lines.length; j < len; key = ++j) { + line = lines[key]; if (matches = line.match(new RegExp("^(\\s{" + space + "})((?:[0-9]+\\.?)|\\-|\\+|\\*)(\\s+)(.*)$"))) { + if (type === 'ol' && key === 0) { + start = parseInt(matches[2]); + if (start !== 1) { + suffix = ' start="' + start + '"'; + } + } rows.push([matches[4]]); last = rows.length - 1; } else { - rows[last].push(line.replace(new RegExp("^\\s{" + space + "}"), '')); + rows[last].push(line.replace(new RegExp("^\\s{" + (tab + space) + "}"), '')); } } for (l = 0, len1 = rows.length; l < len1; l++) { @@ -974,7 +987,7 @@ html += '