diff --git a/CHANGELOG.md b/CHANGELOG.md index 4553f687e..dd97febd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.3 +### Bug fixes +- Optimize progress bar again + ## 1.1.2 ### Bug fixes - fix failed `auto2top` in mobile diff --git a/README.md b/README.md index 055c0f444..6daf80296 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,9 @@ Create a `404.html` and `README.md` into `/docs`. - + +

+ ``` @@ -41,7 +43,9 @@ index.html - + +

+ ``` diff --git a/lib/docsify.js b/lib/docsify.js index 2dbcdf1cc..2b0149660 100644 --- a/lib/docsify.js +++ b/lib/docsify.js @@ -2426,8 +2426,8 @@ function renderArticle (content) { * navbar */ function renderNavbar (content) { - if (CACHE['navbar'] && CACHE['navbar'] === content) { return } - CACHE['navbar'] = content; + if (CACHE.navbar && CACHE.navbar === content) { return } + CACHE.navbar = content; renderNavbar.rendered = true; if (content) { renderTo('nav', marked(content)); } @@ -2450,8 +2450,8 @@ function renderSidebar (content) { } renderSidebar.rendered = true; - if (CACHE['sidebar'] && CACHE['sidebar'] === content) { return } - CACHE['sidebar'] = content; + if (CACHE.sidebar && CACHE.sidebar === content) { return } + CACHE.sidebar = content; renderTo('aside.sidebar', content); if (isToc) { scrollActiveSidebar(); } toc = []; @@ -2467,24 +2467,23 @@ function renderLoading (ref) { var num = Math.floor(loaded / total * 100); - if (!CACHE['loading']) { + if (!CACHE.loading) { var div = document.createElement('div'); div.classList.add('progress'); document.body.appendChild(div); - CACHE['loading'] = div; + CACHE.loading = div; } + CACHE.loading.style.opacity = 1; + CACHE.loading.style.width = num >= 95 ? '100%' : num + '%'; + if (num >= 95) { clearTimeout(renderLoading.cacheTImeout); - CACHE['loading'].style.width = '100%'; renderLoading.cacheTImeout = setTimeout(function (_) { - CACHE['loading'].style.opacity = 0; - CACHE['loading'].style.width = '0%'; + CACHE.loading.style.opacity = 0; + CACHE.loading.style.width = '0%'; }, 200); - } else { - CACHE['loading'].style.opacity = 1; - CACHE['loading'].style.width = num + '%'; } } diff --git a/lib/docsify.min.js b/lib/docsify.min.js index 147e52982..b82a1c8cd 100644 --- a/lib/docsify.min.js +++ b/lib/docsify.min.js @@ -1,2 +1,2 @@ -var Docsify=function(){"use strict";function e(e,t,n){void 0===t&&(t="GET");var r=new XMLHttpRequest;return r.open(t,e),r.send(),{then:function(e,t){void 0===t&&(t=function(){}),n&&(r.addEventListener("progress",n),r.addEventListener("loaded",n)),r.addEventListener("error",t),r.addEventListener("load",function(n){var r=n.target;r.status>=400?t(r):e(r.response)})},abort:function(){return 4!==r.readyState&&r.abort()}}}function t(e,t){var n=[],r={};return e.forEach(function(e){var i=e.level||1,a=i-1;i>t||(r[a]?(r[a].children=r[a].children||[],r[a].children.push(e)):n.push(e),r[i]=e)}),n}function n(e){return e.replace(/([A-Z])/g,function(e){return"-"+e.toLowerCase()})}function r(e){return null===e||void 0===e}function i(){var e=window.location;if(_===e.hash&&!r(S))return S;var t=e.hash.match(/^#\/([^#]+)/);return t=t&&2===t.length?t[1]:/^#\//.test(e.hash)?"":e.pathname,S=t,_=e.hash,t}function a(){return/mobile/i.test(navigator.userAgent)}function s(){function e(){for(var e=0,r=t.length;e10){var o=n[a.id];if(!o||o===i)return;return i&&i.setAttribute("class",""),o.setAttribute("class","active"),void(i=o)}}}if(!a()){for(var t=document.querySelectorAll(".anchor"),n={},r=document.querySelectorAll(".sidebar li"),i=null,s=0,o=r.length;s\n \n '):""}function h(){return'

\n \n

'}function d(e){return e?'':""}function f(e,t){return void 0===t&&(t=""),e&&e.length?(e.forEach(function(e){t+='

'+e.title+"

",e.children&&(t+='

'+f(e.children)+"")}),t):""}function m(e,t){var n=document.querySelector("nav")||document.createElement("nav");e[t?"outerHTML":"innerHTML"]=d($.sidebarToggle)+g($.repo)+h(),document.body.insertBefore(n,document.body.children[0]),u("button.sidebar-toggle")}function b(e){q("article",e?C(e):"not found"),k.rendered||k(null,$),y.rendered||y(null,$),k.rendered=!1,y.rendered=!1,$.auto2top&&c()}function y(e){E.navbar&&E.navbar===e||(E.navbar=e,y.rendered=!0,e&&q("nav",C(e)),l("nav"))}function k(e){var n=!1;e?e=C(e):$.sidebar?e=f($.sidebar,"

An error occured:

"+s(e.message+"",!0)+"

";throw e}}var g={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:u,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:u,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:/^ *\[([^\]]+)\]: *]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:u,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};g.bullet=/(?:[*+-]|\d+\.)/,g.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/,g.item=l(g.item,"gm")(/bull/g,g.bullet)(),g.list=l(g.list)(/bull/g,g.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+g.def.source+")")(),g.blockquote=l(g.blockquote)("def",g.def)(),g._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",g.html=l(g.html)("comment",//)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/])*?>/)(/tag/g,g._tag)(),g.paragraph=l(g.paragraph)("hr",g.hr)("heading",g.heading)("lheading",g.lheading)("blockquote",g.blockquote)("tag","<"+g._tag)("def",g.def)(),g.normal=c({},g),g.gfm=c({},g.normal,{fences:/^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\s*\1 *(?:\n+|$)/,paragraph:/^/,heading:/^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/}),g.gfm.paragraph=l(g.paragraph)("(?!","(?!"+g.gfm.fences.source.replace("\\1","\\2")+"|"+g.list.source.replace("\\1","\\3")+"|")(),g.tables=c({},g.gfm,{nptable:/^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,table:/^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/}),n.rules=g,n.lex=function(e,t){var r=new n(t);return r.lex(e)},n.prototype.lex=function(e){return e=e.replace(/\r\n|\r/g,"\n").replace(/\t/g," ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n"),this.token(e,!0)},n.prototype.token=function(e,t,n){for(var r,i,a,s,o,l,u,c,p,h=this,e=e.replace(/^ +$/gm,"");e;)if((a=h.rules.newline.exec(e))&&(e=e.substring(a[0].length),a[0].length>1&&h.tokens.push({type:"space"})),a=h.rules.code.exec(e))e=e.substring(a[0].length),a=a[0].replace(/^ {4}/gm,""),h.tokens.push({type:"code",text:h.options.pedantic?a:a.replace(/\n+$/,"")});else if(a=h.rules.fences.exec(e))e=e.substring(a[0].length),h.tokens.push({type:"code",lang:a[2],text:a[3]||""});else if(a=h.rules.heading.exec(e))e=e.substring(a[0].length),h.tokens.push({type:"heading",depth:a[1].length,text:a[2]});else if(t&&(a=h.rules.nptable.exec(e))){for(e=e.substring(a[0].length),l={type:"table",header:a[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:a[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:a[3].replace(/\n$/,"").split("\n")},c=0;c ?/gm,""),h.token(a,t,!0),h.tokens.push({type:"blockquote_end"});else if(a=h.rules.list.exec(e)){for(e=e.substring(a[0].length),s=a[2],h.tokens.push({type:"list_start",ordered:s.length>1}),a=a[0].match(h.rules.item),r=!1,p=a.length,c=0;c1&&o.length>1||(e=a.slice(c+1).join("\n")+e,c=p-1)),i=r||/\n\n(?!\s*$)/.test(l),c!==p-1&&(r="\n"===l.charAt(l.length-1),i||(i=r)),h.tokens.push({type:i?"loose_item_start":"list_item_start"}),h.token(l,!1,n),h.tokens.push({type:"list_item_end"});h.tokens.push({type:"list_end"})}else if(a=h.rules.html.exec(e))e=e.substring(a[0].length),h.tokens.push({type:h.options.sanitize?"paragraph":"html",pre:!h.options.sanitizer&&("pre"===a[1]||"script"===a[1]||"style"===a[1]),text:a[0]});else if(!n&&t&&(a=h.rules.def.exec(e)))e=e.substring(a[0].length),h.tokens.links[a[1].toLowerCase()]={href:a[2],title:a[3]};else if(t&&(a=h.rules.table.exec(e))){for(e=e.substring(a[0].length),l={type:"table",header:a[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:a[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:a[3].replace(/(?: *\| *)?\n$/,"").split("\n")},c=0;c])/,autolink:/^<([^ >]+(@|:\/)[^ >]+)>/,url:u,tag:/^|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,link:/^!?\[(inside)\]$href$/,reflink:/^!?\[(inside)\]\s*\[([^\]]*)\]/,nolink:/^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,strong:/^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,em:/^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:u,text:/^[\s\S]+?(?=[\\?(?:\s+['"]([\s\S]*?)['"])?\s*/,h.link=l(h.link)("inside",h._inside)("href",h._href)(),h.reflink=l(h.reflink)("inside",h._inside)(),h.normal=c({},h),h.pedantic=c({},h.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/}),h.gfm=c({},h.normal,{escape:l(h.escape)("])","~|])")(),url:/^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:l(h.text)("]|","~]|")("|","|https?://|")()}),h.breaks=c({},h.gfm,{br:l(h.br)("{2,}","*")(),text:l(h.gfm.text)("{2,}","*")()}),r.rules=h,r.output=function(e,t,n){var i=new r(t,n);return i.output(e)},r.prototype.output=function(e){for(var t,n,r,i,a=this,o="";e;)if(i=a.rules.escape.exec(e))e=e.substring(i[0].length),o+=i[1];else if(i=a.rules.autolink.exec(e))e=e.substring(i[0].length),"@"===i[2]?(n=":"===i[1].charAt(6)?a.mangle(i[1].substring(7)):a.mangle(i[1]),r=a.mangle("mailto:")+n):(n=s(i[1]),r=n),o+=a.renderer.link(r,null,n);else if(a.inLink||!(i=a.rules.url.exec(e))){if(i=a.rules.tag.exec(e))!a.inLink&&/^/i.test(i[0])&&(a.inLink=!1),e=e.substring(i[0].length),o+=a.options.sanitize?a.options.sanitizer?a.options.sanitizer(i[0]):s(i[0]):i[0];else if(i=a.rules.link.exec(e))e=e.substring(i[0].length),a.inLink=!0,o+=a.outputLink(i,{href:i[2],title:i[3]}),a.inLink=!1;else if((i=a.rules.reflink.exec(e))||(i=a.rules.nolink.exec(e))){if(e=e.substring(i[0].length),t=(i[2]||i[1]).replace(/\s+/g," "),t=a.links[t.toLowerCase()],!t||!t.href){o+=i[0].charAt(0),e=i[0].substring(1)+e;continue}a.inLink=!0,o+=a.outputLink(i,t),a.inLink=!1}else if(i=a.rules.strong.exec(e))e=e.substring(i[0].length),o+=a.renderer.strong(a.output(i[2]||i[1]));else if(i=a.rules.em.exec(e))e=e.substring(i[0].length),o+=a.renderer.em(a.output(i[2]||i[1]));else if(i=a.rules.code.exec(e))e=e.substring(i[0].length),o+=a.renderer.codespan(s(i[2],!0));else if(i=a.rules.br.exec(e))e=e.substring(i[0].length),o+=a.renderer.br();else if(i=a.rules.del.exec(e))e=e.substring(i[0].length),o+=a.renderer.del(a.output(i[1]));else if(i=a.rules.text.exec(e))e=e.substring(i[0].length),o+=a.renderer.text(s(a.smartypants(i[0])));else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0))}else e=e.substring(i[0].length),n=s(i[1]),r=n,o+=a.renderer.link(r,null,n);return o},r.prototype.outputLink=function(e,t){var n=s(t.href),r=t.title?s(t.title):null;return"!"!==e[0].charAt(0)?this.renderer.link(n,r,this.output(e[1])):this.renderer.image(n,r,s(e[1]))},r.prototype.smartypants=function(e){return this.options.smartypants?e.replace(/---/g,"—").replace(/--/g,"–").replace(/(^|[-\u2014\/(\[{"\s])'/g,"$1‘").replace(/'/g,"’").replace(/(^|[-\u2014\/(\[{\u2018\s])"/g,"$1“").replace(/"/g,"”").replace(/\.{3}/g,"…"):e},r.prototype.mangle=function(e){if(!this.options.mangle)return e;for(var t,n="",r=e.length,i=0;i.5&&(t="x"+t.toString(16)),n+="&#"+t+";";return n},i.prototype.code=function(e,t,n){if(this.options.highlight){var r=this.options.highlight(e,t);null!=r&&r!==e&&(n=!0,e=r)}return t?'

'+(n?e:s(e,!0))+"\n

\n":"

"+(n?e:s(e,!0))+"\n

"},i.prototype.blockquote=function(e){return"

\n"+e+"

\n"},i.prototype.html=function(e){return e},i.prototype.heading=function(e,t,n){return"'+e+"\n"},i.prototype.hr=function(){return this.options.xhtml?"

\n":"

\n"},i.prototype.list=function(e,t){var n=t?"ol":"ul";return"<"+n+">\n"+e+"\n"},i.prototype.listitem=function(e){return"

"+e+"

\n"},i.prototype.paragraph=function(e){return"

"+e+"

\n"},i.prototype.table=function(e,t){return"\n\n"+e+"\n\n"+t+"\n

\n"},i.prototype.tablerow=function(e){return"\n"+e+"\n"},i.prototype.tablecell=function(e,t){var n=t.header?"th":"td",r=t.align?"<"+n+' style="text-align:'+t.align+'">':"<"+n+">";return r+e+"\n"},i.prototype.strong=function(e){return""+e+""},i.prototype.em=function(e){return""+e+""},i.prototype.codespan=function(e){return""+e+""},i.prototype.br=function(){return this.options.xhtml?"
":"
"},i.prototype.del=function(e){return"~~"+e+"~~"},i.prototype.link=function(e,t,n){if(this.options.sanitize){try{var r=decodeURIComponent(o(e)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return""}if(0===r.indexOf("javascript:")||0===r.indexOf("vbscript:"))return""}var i='"},i.prototype.image=function(e,t,n){var r=' '+n+'

":">"},i.prototype.text=function(e){return e},a.parse=function(e,t,n){var r=new a(t,n);return r.parse(e)},a.prototype.parse=function(e){var t=this;this.inline=new r(e.links,this.options,this.renderer),this.tokens=e.reverse();for(var n="";this.next();)n+=t.tok();return n},a.prototype.next=function(){return this.token=this.tokens.pop()},a.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0},a.prototype.parseText=function(){for(var e=this,t=this.token.text;"text"===this.peek().type;)t+="\n"+e.next().text;return this.inline.output(t)},a.prototype.tok=function(){var e=this;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 t,n,r,i,a,s="",o="";for(r="",t=0;te.length)break e;if(!(b instanceof i)){c.lastIndex=0;var y=c.exec(b),k=1;if(!y&&h&&m!=a.length-1){var v=a[m+1].matchedStr||a[m+1],x=b+v;if(m=b.length)continue;var S=y.index+y[0].length,_=b.length+v.length;if(k=3,S<=_){if(a[m+1].greedy)continue;k=2,x=x.slice(0,_)}b=x}if(y){g&&(d=y[1].length);var w=y.index+d,y=y[0].slice(d),S=w+y.length,L=b.slice(0,w),C=b.slice(S),A=[m,k];L&&A.push(L);var $=new i(o,p?r.tokenize(y,p):y,f,y,h);A.push($),C&&A.push(C),Array.prototype.splice.apply(a,A)}}}}}return a},hooks:{all:{},add:function(e,t){var n=r.hooks.all;n[e]=n[e]||[],n[e].push(t)},run:function(e,t){var n=r.hooks.all[e];if(n&&n.length)for(var i,a=0;i=n[a++];)i(t)}}},i=r.Token=function(e,t,n,r,i){this.type=e,this.content=t,this.alias=n,this.matchedStr=r||null,this.greedy=!!i};if(i.stringify=function(e,t,n){if("string"==typeof e)return e;if("Array"===r.util.type(e))return e.map(function(n){return i.stringify(n,t,e)}).join("");var a={type:e.type,content:i.stringify(e.content,t,n),tag:"span",classes:["token",e.type],attributes:{},language:t,parent:n};if("comment"==a.type&&(a.attributes.spellcheck="true"),e.alias){var s="Array"===r.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(a.classes,s)}r.hooks.run("wrap",a);var o="";for(var l in a.attributes)o+=(o?" ":"")+l+'="'+(a.attributes[l]||"")+'"';return"<"+a.tag+' class="'+a.classes.join(" ")+'" '+o+">"+a.content+""},!t.document)return t.addEventListener?(t.addEventListener("message",function(e){var n=JSON.parse(e.data),i=n.language,a=n.code,s=n.immediateClose;t.postMessage(r.highlight(a,r.languages[i],i)),s&&t.close()},!1),t.Prism):t.Prism;var a=document.currentScript||[].slice.call(document.getElementsByTagName("script")).pop();return a&&(r.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&("loading"!==document.readyState?requestAnimationFrame(r.highlightAll,0):document.addEventListener("DOMContentLoaded",r.highlightAll))),t.Prism}();"undefined"!=typeof e&&e.exports&&(e.exports=n),"undefined"!=typeof L&&(L.Prism=n),n.languages.markup={comment://,prolog:/<\?[\w\W]+?\?>/,doctype://,cdata://i,tag:{pattern:/<\/?(?!\d)[^\s>\/=.$<]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/[=>"']/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},n.hooks.add("wrap",function(e){"entity"===e.type&&(e.attributes.title=e.content.replace(/&/,"&"))}),n.languages.xml=n.languages.markup,n.languages.html=n.languages.markup,n.languages.mathml=n.languages.markup,n.languages.svg=n.languages.markup,n.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url$(?:(["'])(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1|.*?)$/i,selector:/[^\{\}\s][^\{\};]*?(?=\s*\{)/,string:/("|')(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,function:/[-a-z0-9]+(?=$)/i,punctuation:/[(){};:]/},n.languages.css.atrule.inside.rest=n.util.clone(n.languages.css),n.languages.markup&&(n.languages.insertBefore("markup","tag",{style:{pattern:/()[\w\W]*?(?=<\/style>)/i,lookbehind:!0,inside:n.languages.css,alias:"language-css"}}),n.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:n.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:n.languages.css}},alias:"language-css"}},n.languages.markup.tag)),n.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:{pattern:/(["'])(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,greedy:!0},"class-name":{pattern:/((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\$/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,boolean:/\b(true|false)\b/,function:/[a-z0-9_]+(?=\()/i,number:/\b-?(?:0x[\da-f]+|\d*\.?\d+(?:e[+-]?\d+)?)\b/i,operator:/--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/},n.languages.javascript=n.languages.extend("clike",{keyword:/\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,function:/[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i}),n.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^\/])\/(?!\/)(\[.+?]|\\.|[^\/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0,greedy:!0}}),n.languages.insertBefore("javascript","string",{"template-string":{pattern:/`(?:\\\\|\\?[^\\])*?`/,greedy:!0,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:n.languages.javascript}},string:/[\s\S]+/}}}),n.languages.markup&&n.languages.insertBefore("markup","tag",{script:{pattern:/()[\w\W]*?(?=<\/script>)/i,lookbehind:!0,inside:n.languages.javascript,alias:"language-javascript"}}),n.languages.js=n.languages.javascript,function(){"undefined"!=typeof self&&self.Prism&&self.document&&document.querySelector&&(self.Prism.fileHighlight=function(){var e={js:"javascript",py:"python",rb:"ruby",ps1:"powershell",psm1:"powershell",sh:"bash",bat:"batch",h:"c",tex:"latex"};Array.prototype.forEach&&Array.prototype.slice.call(document.querySelectorAll("pre[data-src]")).forEach(function(t){for(var r,i=t.getAttribute("data-src"),a=t,s=/\blang(?:uage)?-(?!\*)(\w+)\b/i;a&&!s.test(a.className);)a=a.parentNode;if(a&&(r=(t.className.match(s)||[,""])[1]),!r){var o=(i.match(/\.(\w+)$/)||[,""])[1];r=e[o]||o}var l=document.createElement("code");l.className="language-"+r,t.textContent="",l.textContent="Loading…",t.appendChild(l);var u=new XMLHttpRequest;u.open("GET",i,!0),u.onreadystatechange=function(){4==u.readyState&&(u.status<400&&u.responseText?(l.textContent=u.responseText,n.highlightElement(l)):u.status>=400?l.textContent="✖ Error "+u.status+" while fetching file: "+u.statusText:l.textContent="✖ Error: File does not exist or is empty")},u.send(null)})},document.addEventListener("DOMContentLoaded",self.Prism.fileHighlight))}()}),$={},E={},q=function(e,t){return e="object"==typeof e?e:document.querySelector(e),e.innerHTML=t,e},j=[],T=new C.Renderer;T.heading=function(e,t){var n=e.toLowerCase().replace(/<(?:.|\n)*?>/gm,"").replace(/[^\w|\u4e00-\u9fa5]+/g,"-"),r="";return $.router&&(r="#/"+i()),j.push({level:t,slug:r+"#"+n,title:e}),"'+e+""},T.code=function(e,t){void 0===t&&(t="");var n=A.highlight(e,A.languages[t]||A.languages.markup);return'

'+n+"

"; +var Docsify=function(){"use strict";function e(e,t,n){void 0===t&&(t="GET");var r=new XMLHttpRequest;return r.open(t,e),r.send(),{then:function(e,t){void 0===t&&(t=function(){}),n&&(r.addEventListener("progress",n),r.addEventListener("loaded",n)),r.addEventListener("error",t),r.addEventListener("load",function(n){var r=n.target;r.status>=400?t(r):e(r.response)})},abort:function(){return 4!==r.readyState&&r.abort()}}}function t(e,t){var n=[],r={};return e.forEach(function(e){var i=e.level||1,a=i-1;i>t||(r[a]?(r[a].children=r[a].children||[],r[a].children.push(e)):n.push(e),r[i]=e)}),n}function n(e){return e.replace(/([A-Z])/g,function(e){return"-"+e.toLowerCase()})}function r(e){return null===e||void 0===e}function i(){var e=window.location;if(_===e.hash&&!r(S))return S;var t=e.hash.match(/^#\/([^#]+)/);return t=t&&2===t.length?t[1]:/^#\//.test(e.hash)?"":e.pathname,S=t,_=e.hash,t}function a(){return/mobile/i.test(navigator.userAgent)}function s(){function e(){for(var e=0,r=t.length;e10){var o=n[a.id];if(!o||o===i)return;return i&&i.setAttribute("class",""),o.setAttribute("class","active"),void(i=o)}}}if(!a()){for(var t=document.querySelectorAll(".anchor"),n={},r=document.querySelectorAll(".sidebar li"),i=null,s=0,o=r.length;s\n \n '):""}function h(){return'

\n \n

'}function d(e){return e?'':""}function f(e,t){return void 0===t&&(t=""),e&&e.length?(e.forEach(function(e){t+='

'+e.title+"

",e.children&&(t+='

An error occured:

"+s(e.message+"",!0)+"

'+(n?e:s(e,!0))+"\n

\n":"

"+(n?e:s(e,!0))+"\n

"},i.prototype.blockquote=function(e){return"

\n"+e+"

\n"},i.prototype.html=function(e){return e},i.prototype.heading=function(e,t,n){return"'+e+"\n"},i.prototype.hr=function(){return this.options.xhtml?"

\n":"

\n"},i.prototype.list=function(e,t){var n=t?"ol":"ul";return"<"+n+">\n"+e+"\n"},i.prototype.listitem=function(e){return"

"+e+"

\n"},i.prototype.paragraph=function(e){return"

"+e+"

\n"},i.prototype.table=function(e,t){return"\n\n"+e+"\n\n"+t+"\n

'+n+"

"; },T.link=function(e,t,n){return $.router&&!/^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/.test(e)&&(e=/^\/#/.test(e)?e:"#"+e),''+n+""},C.setOptions({renderer:T});var N={el:"#app",repo:"",maxLevel:6,sidebar:"",sidebarToggle:!1,loadSidebar:null,loadNavbar:null,router:!1,auto2top:!1},P=document.currentScript||[].slice.call(document.getElementsByTagName("script")).pop();if(P){for(var O in N){var W=P.getAttribute("data-"+n(O));N[O]=r(W)?N[O]:W||!0}N.loadSidebar===!0&&(N.loadSidebar="_sidebar.md"),N.loadNavbar===!0&&(N.loadNavbar="_navbar.md"),N.sidebar&&(N.sidebar=window[N.sidebar])}x(N);var z=null,M=null,F=function(t){var n=i();if(z===n)return t();var r,a=z=n;/\//.test(a)?a&&!/\/$/.test(a)&&(a=a.match(/(\S*\/)[^\/]+$/)[1]):a="",M&&M.abort&&M.abort(),M=e(!n||/\/$/.test(n)?n+"README.md":n+".md","GET",v),M.then(function(e){b(e),N.loadSidebar?(r===!1&&t(),r=!1):t()},function(e){return b(null)}),N.loadSidebar&&e(a+N.loadSidebar).then(function(e){k(e),r===!1&&t(),r=!1}),N.loadNavbar&&e(a+N.loadNavbar).then(y)},I=function(){var e=document.querySelector(N.el)||document.body,t=e!==document.body,n=function(){F(function(e){l("aside.sidebar",!0),o()})};m(e,t),n(),N.router&&(/^#\//.test(window.location.hash)||(window.location.hash="#/"),window.addEventListener("hashchange",n))},B=I();return B}(); diff --git a/package.json b/package.json index aa4cb3069..89e81f395 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "docsify", - "version": "1.1.2", + "version": "1.1.3", "description": "A magical documentation generator.", "main": "lib/docsify.js", "files": [ diff --git a/src/render.js b/src/render.js index 4326664a5..e051a2f94 100644 --- a/src/render.js +++ b/src/render.js @@ -77,8 +77,8 @@ export function renderArticle (content) { * navbar */ export function renderNavbar (content) { - if (CACHE['navbar'] && CACHE['navbar'] === content) return - CACHE['navbar'] = content + if (CACHE.navbar && CACHE.navbar === content) return + CACHE.navbar = content renderNavbar.rendered = true if (content) renderTo('nav', marked(content)) @@ -101,8 +101,8 @@ export function renderSidebar (content) { } renderSidebar.rendered = true - if (CACHE['sidebar'] && CACHE['sidebar'] === content) return - CACHE['sidebar'] = content + if (CACHE.sidebar && CACHE.sidebar === content) return + CACHE.sidebar = content renderTo('aside.sidebar', content) if (isToc) scrollActiveSidebar() toc = [] @@ -115,24 +115,23 @@ export function renderSidebar (content) { export function renderLoading ({ loaded, total }) { const num = Math.floor(loaded / total * 100) - if (!CACHE['loading']) { + if (!CACHE.loading) { const div = document.createElement('div') div.classList.add('progress') document.body.appendChild(div) - CACHE['loading'] = div + CACHE.loading = div } + CACHE.loading.style.opacity = 1 + CACHE.loading.style.width = num >= 95 ? '100%' : num + '%' + if (num >= 95) { clearTimeout(renderLoading.cacheTImeout) - CACHE['loading'].style.width = '100%' renderLoading.cacheTImeout = setTimeout(_ => { - CACHE['loading'].style.opacity = 0 - CACHE['loading'].style.width = '0%' + CACHE.loading.style.opacity = 0 + CACHE.loading.style.width = '0%' }, 200) - } else { - CACHE['loading'].style.opacity = 1 - CACHE['loading'].style.width = num + '%' } }