- '+N(e.children)+"
- ');
+ cacheTree[currentPath] = tree$$1;
}
return html
@@ -3121,6 +3125,22 @@ function renderMain (html) {
}
}
+function renderNameLink (vm) {
+ var el = getNode('.app-name-link');
+ var nameLink = vm.config.nameLink;
+ var path = vm.route.path;
+
+ if (!el) { return }
+
+ if (isPrimitive(vm.config.nameLink)) {
+ el.setAttribute('href', nameLink);
+ } else if (typeof nameLink === 'object') {
+ var match = Object.keys(nameLink).find(function (key) { return path.indexOf(key) > -1; });
+
+ el.setAttribute('href', nameLink[match]);
+ }
+}
+
function renderMixin (proto) {
proto._renderTo = function (el, content, replace) {
var node = getNode(el);
@@ -3136,7 +3156,7 @@ function renderMixin (proto) {
this._renderTo('.sidebar-nav', sidebar(text, maxLevel));
var active = getAndActive('.sidebar-nav', true, true);
- loadSidebar && subSidebar(active, subMaxLevel);
+ subSidebar(loadSidebar ? active : '', subMaxLevel);
// bind event
this.activeLink = active;
scrollActiveSidebar();
@@ -3200,6 +3220,8 @@ function renderMixin (proto) {
proto._updateRender = function () {
markdown.update();
+ // render name link
+ renderNameLink(this);
};
}
@@ -3278,6 +3300,7 @@ var lastRoute = {};
function initRoute (vm) {
normalize();
lastRoute = vm.route = parse();
+ vm._updateRender();
on('hashchange', function (_) {
normalize();
@@ -3312,6 +3335,16 @@ function initEvent (vm) {
}
}
+function loadNested (path, file, next, vm, first) {
+ path = first ? path : path.replace(/\/$/, '');
+ path = getParentPath(path);
+
+ if (!path) { return }
+
+ get(vm.$getFile(path + file))
+ .then(next, function (_) { return loadNested(path, file, next, vm); });
+}
+
function fetchMixin (proto) {
var last;
proto._fetch = function (cb) {
@@ -3323,7 +3356,6 @@ function fetchMixin (proto) {
var ref$1 = this.config;
var loadNavbar = ref$1.loadNavbar;
var loadSidebar = ref$1.loadSidebar;
- var root = getRoot(path);
// Abort last request
last && last.abort && last.abort();
@@ -3341,20 +3373,13 @@ function fetchMixin (proto) {
var fn = function (result) { this$1._renderSidebar(result); cb(); };
// Load sidebar
- get(this$1.$getFile(root + loadSidebar))
- // fallback root navbar when fail
- .then(fn, function (_) { return get(loadSidebar).then(fn); });
+ loadNested(path, loadSidebar, fn, this$1, true);
},
function (_) { return this$1._renderMain(null); });
// Load nav
loadNavbar &&
- get(this.$getFile(root + loadNavbar))
- .then(
- function (text) { return this$1._renderNav(text); },
- // fallback root navbar when fail
- function (_) { return get(loadNavbar).then(function (text) { return this$1._renderNav(text); }); }
- );
+ loadNested(path, loadNavbar, function (text) { return this$1._renderNav(text); }, this, true);
};
proto._fetchCover = function () {
@@ -3362,7 +3387,7 @@ function fetchMixin (proto) {
var ref = this.config;
var coverpage = ref.coverpage;
- var root = getRoot(this.route.path);
+ var root = getParentPath(this.route.path);
var path = this.$getFile(root + coverpage);
if (this.route.path !== '/' || !coverpage) {
diff --git a/lib/docsify.min.js b/lib/docsify.min.js
index c7f1a66cc..1837ca313 100644
--- a/lib/docsify.min.js
+++ b/lib/docsify.min.js
@@ -1,2 +1,2 @@
-!function(){"use strict";function e(e){var t=Object.create(null);return function(n){var r=t[n];return r||(t[n]=e(n))}}function t(e){return"string"==typeof e||"number"==typeof e}function n(){}function r(e){return"function"==typeof e}function i(e){var t=["init","mounted","beforeEach","afterEach","doneEach","ready"];e._hooks={},e._lifecycle={},t.forEach(function(t){var n=e._hooks[t]=[];e._lifecycle[t]=function(e){return n.push(e)}})}function a(e,t,r,i){void 0===i&&(i=n);var a=r,o=e._hooks[t],s=function(e){var t=o[e];if(e>=o.length)i(a);else if("function"==typeof t)if(2===t.length)t(r,function(t){a=t,s(e+1)});else{var n=t(r);a=void 0!==n?n:a,s(e+1)}else s(e+1)};s(0)}function o(e,t){return void 0===t&&(t=!1),"string"==typeof e&&(e=t?s(e):me[e]||s(e)),e}function s(e,t){return t?e.querySelector(t):ve.querySelector(e)}function l(e,t){return[].slice.call(t?e.querySelectorAll(t):ve.querySelectorAll(e))}function u(e,t){return e=ve.createElement(e),t&&(e.innerHTML=t),e}function c(e,t){return e.appendChild(t)}function p(e,t){return e.insertBefore(t,e.children[0])}function h(e,t,n){r(t)?window.addEventListener(e,t):e.addEventListener(t,n)}function d(e,t,n){r(t)?window.removeEventListener(e,t):e.removeEventListener(t,n)}function g(e,t,n){e&&e.classList[n?t:"toggle"](n||t)}function f(e){var t={};return(e=e.trim().replace(/^(\?|#|&)/,""))?(e.split("&").forEach(function(e){var n=e.replace(/\+/g," ").split("=");t[n[0]]=Le(n[1])}),t):t}function m(e){var t=[];for(var n in e)t.push((Se(n)+"="+Se(e[n])).toLowerCase());return t.length?"?"+t.join("&"):""}function v(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];return Te(e.join("/"))}function b(e){var t=window.location.href.indexOf("#");window.location.replace(window.location.href.slice(0,t>=0?t:0)+"#"+e)}function y(){var e=k();return e=Ae(e),"/"===e.charAt(0)?b(e):void b("/"+e)}function k(){var e=window.location.href,t=e.indexOf("#");return t===-1?"":e.slice(t+1)}function w(e){void 0===e&&(e=window.location.href);var t="",n=e.indexOf("?");n>=0&&(t=e.slice(n+1),e=e.slice(0,n));var r=e.indexOf("#");return r&&(e=e.slice(r+1)),{path:e,query:f(t)}}function x(e,t){var n=w(Ae(e));return n.query=ue({},n.query,t),e=n.path+m(n.query),Te("#/"+e)}function _(e){var t=function(){return be.classList.toggle("close")};e=o(e),h(e,"click",t);var n=o(".sidebar");h(n,"click",function(){_e&&t(),setTimeout(function(){return S(n,!0,!0)},0)})}function L(){var e=o("section.cover");if(e){var t=e.getBoundingClientRect().height;window.pageYOffset>=t||e.classList.contains("hidden")?g(be,"add","sticky"):g(be,"remove","sticky")}}function S(e,t,n){e=o(e);var r,i=l(e,"a"),a="#"+k();return i.sort(function(e,t){return t.href.length-e.href.length}).forEach(function(e){var n=e.getAttribute("href"),i=t?e.parentNode:e;0!==a.indexOf(n)||r?g(i,"remove","active"):(r=e,g(i,"add","active"))}),n&&(ve.title=r?r.innerText+" - "+Me:Me),r}function C(){for(var e,t=o(".sidebar"),n=l(".anchor"),r=s(t,".sidebar-nav"),i=s(t,"li.active"),a=be.scrollTop,u=0,c=n.length;u
- '+e.title+" ",e.children&&(t+='
'+t.slice(5).trim()+"
"}function I(e){return""}function z(e,t){return t={exports:{}},e(t,t.exports),t.exports}function H(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||[]).concat(e):n.push(e),r[i]=e)}),n}function R(e){if("string"!=typeof e)return"";var t=e.toLowerCase().trim().replace(/<[^>\d]+>/g,"").replace(Be,"").replace(/\s/g,"-").replace(/-+/g,"-").replace(/^(\d)/,"_$1"),n=We[t];return n=We.hasOwnProperty(t)?n+1:0,We[t]=n,n&&(t=t+"-"+n),t}function W(e,t){return'
'}function B(e){return e.replace(/<(pre|template|code)[^>]*?>[\s\S]+?<\/(pre|template|code)>/g,function(e){return e.replace(/:/g,"__colon__")}).replace(/:(\w+?):/gi,window.emojify||W).replace(/__colon__/g,":")}function D(e,t){var n="";if(e)n=Ye(e),n=n.match(/- ")}return n}function U(e,t){if(e){Ve[0]&&1===Ve[0].level&&Ve.shift();var n=Ze[Ge]||H(Ve,t);e.parentNode.innerHTML+=N(n,'
- "+e+" \n"},r.prototype.paragraph=function(e){return"
- '+e.title+" ",e.children&&(t+='
- '+N(e.children)+"
- "+e+" \n"},r.prototype.paragraph=function(e){return"
- '),Ze[Ge]=n}Ve=[]}function G(e){var t=Ve.slice(),n=Ye(e);return Ve=t.slice(),n}function X(){var e=l(".markdown-section>script").filter(function(e){return!/template/.test(e.type)})[0];if(!e)return!1;var t=e.innerText.trim();return!!t&&void setTimeout(function(e){window.__EXECUTE_RESULT__=new Function(t)()},0)}function Z(e){e||(e="not found"),this._renderTo(".markdown-section",e),!this.config.loadSidebar&&this._renderSidebar(),this.config.executeScript===!1||"undefined"==typeof window.Vue||X()?this.config.executeScript&&X():setTimeout(function(e){var t=window.__EXECUTE_RESULT__;t&&t.$destroy&&t.$destroy(),window.__EXECUTE_RESULT__=(new window.Vue).$mount("#main")},0),this.config.auto2top&&T(this.config.auto2top)}function V(e){e._renderTo=function(e,t,n){var r=o(e);r&&(r[n?"outerHTML":"innerHTML"]=t)},e._renderSidebar=function(e){var t=this.config,n=t.maxLevel,r=t.subMaxLevel,i=t.autoHeader,a=t.loadSidebar;this._renderTo(".sidebar-nav",D(e,n));var s=S(".sidebar-nav",!0,!0);if(a&&U(s,r),this.activeLink=s,E(),i&&s){var l=o("#main"),c=l.children[0];if(c&&"H1"!==c.tagName){var h=u("h1");h.innerText=s.innerText,p(l,h)}}},e._renderNav=function(e){e&&this._renderTo("nav",Ye(e)),S("nav")},e._renderMain=function(e){var t=this;a(this,"beforeEach",e,function(e){var n=t.isHTML?e:Ye(e);a(t,"afterEach",n,function(e){return Z.call(t,e)})})},e._renderCover=function(e){var t=o(".cover");if(!e)return void g(t,"remove","show");g(t,"add","show");var n=this.coverIsHTML?e:G(e),r=n.trim().match('
"+a(e.message+"",!0)+"";throw e}}var p={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:l,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:l,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:l,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};p.bullet=/(?:[*+-]|\d+\.)/,p.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/,p.item=s(p.item,"gm")(/bull/g,p.bullet)(),p.list=s(p.list)(/bull/g,p.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+p.def.source+")")(),p.blockquote=s(p.blockquote)("def",p.def)(),p._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",p.html=s(p.html)("comment",//)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/
'+(n?e:a(e,!0))+"\n"+(n?e:a(e,!0))+"\n\n"+e+"\n"},r.prototype.html=function(e){return e},r.prototype.heading=function(e,t,n){return"
\n":"
\n"},r.prototype.list=function(e,t){var n=t?"ol":"ul";return"<"+n+">\n"+e+"\n"},r.prototype.listitem=function(e){return"
"+e+"
\n"},r.prototype.table=function(e,t){return""+e+""},r.prototype.br=function(){return this.options.xhtml?"":"
"},r.prototype.del=function(e){return"
'+n+""+e+"
"},Xe.image=function(e,t,n){var r=e,i=t?' title="'+t+'"':"";return Ee(e)||(r=v(Ue,e)),''+t.slice(5).trim()+"
"}function I(e){return""}function z(e,t){return t={exports:{}},e(t,t.exports),t.exports}function H(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||[]).concat(e):n.push(e),r[i]=e)}),n}function R(e){if("string"!=typeof e)return"";var t=e.toLowerCase().trim().replace(/<[^>\d]+>/g,"").replace(Ue,"").replace(/\s/g,"-").replace(/-+/g,"-").replace(/^(\d)/,"_$1"),n=De[t];return n=De.hasOwnProperty(t)?n+1:0,De[t]=n,n&&(t=t+"-"+n),t}function W(e,t){return''}function B(e){return e.replace(/<(pre|template|code)[^>]*?>[\s\S]+?<\/(pre|template|code)>/g,function(e){return e.replace(/:/g,"__colon__")}).replace(/:(\w+?):/gi,window.emojify||W).replace(/__colon__/g,":")}function D(e,t){var n="";if(e)n=Qe(e),n=n.match(/- "),Ye[Ze]=r}return n}function U(e,t){if(e){Je[0]&&1===Je[0].level&&Je.shift();var n=Ye[Ze]||H(Je,t);e.parentNode.innerHTML+=N(n,'
- '),Ye[Ze]=n}Je=[]}function G(e){var t=Je.slice(),n=Qe(e);return Je=t.slice(),n}function X(){var e=l(".markdown-section>script").filter(function(e){return!/template/.test(e.type)})[0];if(!e)return!1;var t=e.innerText.trim();return!!t&&void setTimeout(function(e){window.__EXECUTE_RESULT__=new Function(t)()},0)}function Z(e){e||(e="not found"),this._renderTo(".markdown-section",e),!this.config.loadSidebar&&this._renderSidebar(),this.config.executeScript===!1||"undefined"==typeof window.Vue||X()?this.config.executeScript&&X():setTimeout(function(e){var t=window.__EXECUTE_RESULT__;t&&t.$destroy&&t.$destroy(),window.__EXECUTE_RESULT__=(new window.Vue).$mount("#main")},0),this.config.auto2top&&T(this.config.auto2top)}function V(e){var n=o(".app-name-link"),r=e.config.nameLink,i=e.route.path;if(n)if(t(e.config.nameLink))n.setAttribute("href",r);else if("object"==typeof r){var a=Object.keys(r).find(function(e){return i.indexOf(e)>-1});n.setAttribute("href",r[a])}}function Y(e){e._renderTo=function(e,t,n){var r=o(e);r&&(r[n?"outerHTML":"innerHTML"]=t)},e._renderSidebar=function(e){var t=this.config,n=t.maxLevel,r=t.subMaxLevel,i=t.autoHeader,a=t.loadSidebar;this._renderTo(".sidebar-nav",D(e,n));var s=S(".sidebar-nav",!0,!0);if(U(a?s:"",r),this.activeLink=s,E(),i&&s){var l=o("#main"),c=l.children[0];if(c&&"H1"!==c.tagName){var h=u("h1");h.innerText=s.innerText,p(l,h)}}},e._renderNav=function(e){e&&this._renderTo("nav",Qe(e)),S("nav")},e._renderMain=function(e){var t=this;a(this,"beforeEach",e,function(e){var n=t.isHTML?e:Qe(e);a(t,"afterEach",n,function(e){return Z.call(t,e)})})},e._renderCover=function(e){var t=o(".cover");if(!e)return void g(t,"remove","show");g(t,"add","show");var n=this.coverIsHTML?e:G(e),r=n.trim().match('
"+a(e.message+"",!0)+"";throw e}}var p={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:l,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:l,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:l,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};p.bullet=/(?:[*+-]|\d+\.)/,p.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/,p.item=s(p.item,"gm")(/bull/g,p.bullet)(),p.list=s(p.list)(/bull/g,p.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+p.def.source+")")(),p.blockquote=s(p.blockquote)("def",p.def)(),p._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",p.html=s(p.html)("comment",//)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/
'+(n?e:a(e,!0))+"\n"+(n?e:a(e,!0))+"\n\n"+e+"\n"},r.prototype.html=function(e){return e},r.prototype.heading=function(e,t,n){return"
\n":"
\n"},r.prototype.list=function(e,t){var n=t?"ol":"ul";return"<"+n+">\n"+e+"\n"},r.prototype.listitem=function(e){return"
"+e+"
\n"},r.prototype.table=function(e,t){return""+e+""},r.prototype.br=function(){return this.options.xhtml?"":"
"},r.prototype.del=function(e){return"
'+n+""+e+"
"},Ve.image=function(e,t,n){var r=e,i=t?' title="'+t+'"':"";return Te(e)||(r=v(Xe,e)),'No Results!
'; + $panel.innerHTML = html || ("" + NO_DATA_TEXT + "
"); }; var timeId; @@ -231,6 +232,15 @@ function updatePlaceholder (text, path) { } } +function updateNoData (text, path) { + if (typeof text === 'string') { + NO_DATA_TEXT = text; + } else { + var match = Object.keys(text).find(function (key) { return path.indexOf(key) > -1; }); + NO_DATA_TEXT = text[match]; + } +} + function init$$1 (opts) { dom = Docsify.dom; style(); @@ -240,10 +250,12 @@ function init$$1 (opts) { function update (opts, vm) { updatePlaceholder(opts.placeholder, vm.route.path); + updateNoData(opts.noData, vm.route.path); } var CONFIG = { placeholder: 'Type to search', + noData: 'No Results!', paths: 'auto', maxAge: 86400000 // 1 day }; @@ -258,6 +270,7 @@ var install = function (hook, vm) { CONFIG.paths = Array.isArray(opts.paths) ? opts.paths : 'auto'; CONFIG.maxAge = util.isPrimitive(opts.maxAge) ? opts.maxAge : CONFIG.maxAge; CONFIG.placeholder = opts.placeholder || CONFIG.placeholder; + CONFIG.noData = opts.noData || CONFIG.noData; } var isAuto = CONFIG.paths === 'auto'; diff --git a/lib/plugins/search.min.js b/lib/plugins/search.min.js index 70534f978..6055689c3 100644 --- a/lib/plugins/search.min.js +++ b/lib/plugins/search.min.js @@ -1 +1 @@ -this.D=this.D||{},function(){"use strict";function e(e){var n={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"};return String(e).replace(/[&<>"'\/]/g,function(e){return n[e]})}function n(){var e=[];return d.dom.findAll("a:not([data-nosearch])").map(function(n){var t=n.href,i=n.getAttribute("href"),r=d.route.parse(t).path;r&&e.indexOf(r)===-1&&!d.route.isAbsolutePath(i)&&e.push(r)}),e}function t(e){localStorage.setItem("docsify.search.expires",Date.now()+e),localStorage.setItem("docsify.search.index",JSON.stringify(f))}function i(e,n){void 0===n&&(n="");var t,i=window.marked.lexer(n),r=window.Docsify.slugify,o=Docsify.route.toURL,a={};return i.forEach(function(n){if("heading"===n.type&&n.depth<=2)t=o(e,{id:r(n.text)}),a[t]={slug:t,title:n.text,body:""};else{if(!t)return;a[t]?a[t].body?a[t].body+="\n"+(n.text||""):a[t].body=n.text:a[t]={slug:t,title:"",body:""}}}),r.clear(),a}function r(n){var t=[],i=[];Object.keys(f).forEach(function(e){i=i.concat(Object.keys(f[e]).map(function(n){return f[e][n]}))}),n=n.trim().split(/[\s\-\，\\\/]+/);for(var r=function(r){var o=i[r],a=!1,s="",c=o.title&&o.title.trim(),l=o.body&&o.body.trim(),u=o.slug||"";if(c&&l&&(n.forEach(function(n,t){var i=new RegExp(n,"gi"),r=-1,o=-1;if(r=c&&c.search(i),o=l&&l.search(i),r<0&&o<0)a=!1;else{a=!0,o<0&&(o=0);var u=0,p=0;u=o<11?0:o-10,p=0===u?70:o+n.length+60,p>l.length&&(p=l.length);var d="..."+e(l).substring(u,p).replace(i,''+n+"")+"...";s+=d}}),a)){var p={title:e(c),content:s,url:u};t.push(p)}},o=0;o'+e.title+"
\n"+e.content+"
\n"}),i.classList.add("show"),i.innerHTML=t||'No Results!
'};h.on(n,"click",function(e){return"A"!==e.target.tagName&&e.stopPropagation()}),h.on(t,"input",function(n){clearTimeout(e),e=setTimeout(function(e){return o(n.target.value.trim())},100)})}function l(e,n){var t=h.getNode('.search input[type="search"]');if("string"==typeof e)t.placeholder=e;else{var i=Object.keys(e).find(function(e){return n.indexOf(e)>-1});t.placeholder=e[i]}}function u(e){h=Docsify.dom,a(),s(e),c()}function p(e,n){l(e.placeholder,n.route.path)}var d,h,f={},g={placeholder:"Type to search",paths:"auto",maxAge:864e5},m=function(e,n){var t=Docsify.util,i=n.config.search||g;Array.isArray(i)?g.paths=i:"object"==typeof i&&(g.paths=Array.isArray(i.paths)?i.paths:"auto",g.maxAge=t.isPrimitive(i.maxAge)?i.maxAge:g.maxAge,g.placeholder=i.placeholder||g.placeholder);var r="auto"===g.paths;e.mounted(function(e){u(g),!r&&o(g,n)}),e.doneEach(function(e){p(g,n),r&&o(g,n)})};window.$docsify.plugins=[].concat(m,window.$docsify.plugins)}(); +this.D=this.D||{},function(){"use strict";function e(e){var n={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"};return String(e).replace(/[&<>"'\/]/g,function(e){return n[e]})}function n(){var e=[];return d.dom.findAll("a:not([data-nosearch])").map(function(n){var t=n.href,o=n.getAttribute("href"),a=d.route.parse(t).path;a&&e.indexOf(a)===-1&&!d.route.isAbsolutePath(o)&&e.push(a)}),e}function t(e){localStorage.setItem("docsify.search.expires",Date.now()+e),localStorage.setItem("docsify.search.index",JSON.stringify(g))}function o(e,n){void 0===n&&(n="");var t,o=window.marked.lexer(n),a=window.Docsify.slugify,i=Docsify.route.toURL,r={};return o.forEach(function(n){if("heading"===n.type&&n.depth<=2)t=i(e,{id:a(n.text)}),r[t]={slug:t,title:n.text,body:""};else{if(!t)return;r[t]?r[t].body?r[t].body+="\n"+(n.text||""):r[t].body=n.text:r[t]={slug:t,title:"",body:""}}}),a.clear(),r}function a(n){var t=[],o=[];Object.keys(g).forEach(function(e){o=o.concat(Object.keys(g[e]).map(function(n){return g[e][n]}))}),n=n.trim().split(/[\s\-\，\\\/]+/);for(var a=function(a){var i=o[a],r=!1,s="",c=i.title&&i.title.trim(),l=i.body&&i.body.trim(),u=i.slug||"";if(c&&l&&(n.forEach(function(n,t){var o=new RegExp(n,"gi"),a=-1,i=-1;if(a=c&&c.search(o),i=l&&l.search(o),a<0&&i<0)r=!1;else{r=!0,i<0&&(i=0);var u=0,f=0;u=i<11?0:i-10,f=0===u?70:i+n.length+60,f>l.length&&(f=l.length);var p="..."+e(l).substring(u,f).replace(o,''+n+"")+"...";s+=p}}),r)){var f={title:e(c),content:s,url:u};t.push(f)}},i=0;i'+e.title+"
\n"+e.content+"
\n"}),o.classList.add("show"),o.innerHTML=t||''+y+"
"};h.on(n,"click",function(e){return"A"!==e.target.tagName&&e.stopPropagation()}),h.on(t,"input",function(n){clearTimeout(e),e=setTimeout(function(e){return i(n.target.value.trim())},100)})}function l(e,n){var t=h.getNode('.search input[type="search"]');if("string"==typeof e)t.placeholder=e;else{var o=Object.keys(e).find(function(e){return n.indexOf(e)>-1});t.placeholder=e[o]}}function u(e,n){if("string"==typeof e)y=e;else{var t=Object.keys(e).find(function(e){return n.indexOf(e)>-1});y=e[t]}}function f(e){h=Docsify.dom,r(),s(e),c()}function p(e,n){l(e.placeholder,n.route.path),u(e.noData,n.route.path)}var d,h,g={},y="",m={placeholder:"Type to search",noData:"No Results!",paths:"auto",maxAge:864e5},v=function(e,n){var t=Docsify.util,o=n.config.search||m;Array.isArray(o)?m.paths=o:"object"==typeof o&&(m.paths=Array.isArray(o.paths)?o.paths:"auto",m.maxAge=t.isPrimitive(o.maxAge)?o.maxAge:m.maxAge,m.placeholder=o.placeholder||m.placeholder,m.noData=o.noData||m.noData);var a="auto"===m.paths;e.mounted(function(e){f(m),!a&&i(m,n)}),e.doneEach(function(e){p(m,n),a&&i(m,n)})};window.$docsify.plugins=[].concat(v,window.$docsify.plugins)}(); diff --git a/package.json b/package.json index 6caba1fd2..417c288cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "docsify", - "version": "3.1.2", + "version": "3.2.0", "description": "A magical documentation generator.", "main": "lib/docsify.js", "files": [ diff --git a/src/core/fetch/index.js b/src/core/fetch/index.js index 61577ac28..0f2380af2 100644 --- a/src/core/fetch/index.js +++ b/src/core/fetch/index.js @@ -1,14 +1,23 @@ import { get } from './ajax' import { callHook } from '../init/lifecycle' -import { getRoot } from '../route/util' +import { getParentPath } from '../route/util' import { noop } from '../util/core' +function loadNested (path, file, next, vm, first) { + path = first ? path : path.replace(/\/$/, '') + path = getParentPath(path) + + if (!path) return + + get(vm.$getFile(path + file)) + .then(next, _ => loadNested(path, file, next, vm)) +} + export function fetchMixin (proto) { let last proto._fetch = function (cb = noop) { const { path } = this.route const { loadNavbar, loadSidebar } = this.config - const root = getRoot(path) // Abort last request last && last.abort && last.abort() @@ -26,25 +35,18 @@ export function fetchMixin (proto) { const fn = result => { this._renderSidebar(result); cb() } // Load sidebar - get(this.$getFile(root + loadSidebar)) - // fallback root navbar when fail - .then(fn, _ => get(loadSidebar).then(fn)) + loadNested(path, loadSidebar, fn, this, true) }, _ => this._renderMain(null)) // Load nav loadNavbar && - get(this.$getFile(root + loadNavbar)) - .then( - text => this._renderNav(text), - // fallback root navbar when fail - _ => get(loadNavbar).then(text => this._renderNav(text)) - ) + loadNested(path, loadNavbar, text => this._renderNav(text), this, true) } proto._fetchCover = function () { const { coverpage } = this.config - const root = getRoot(this.route.path) + const root = getParentPath(this.route.path) const path = this.$getFile(root + coverpage) if (this.route.path !== '/' || !coverpage) { diff --git a/src/core/render/compiler.js b/src/core/render/compiler.js index 785f70c35..78250f257 100644 --- a/src/core/render/compiler.js +++ b/src/core/render/compiler.js @@ -34,7 +34,6 @@ markdown.renderer = renderer markdown.init = function (config = {}, base = window.location.pathname) { contentBase = getBasePath(base) - currentPath = parse().path if (isFn(config)) { markdownCompiler = config(marked, renderer) @@ -107,8 +106,9 @@ export function sidebar (text, level) { html = markdown(text) html = html.match(/- ')
+ cacheTree[currentPath] = tree
}
return html
diff --git a/src/core/render/index.js b/src/core/render/index.js
index 4144adad9..de7a6fa28 100644
--- a/src/core/render/index.js
+++ b/src/core/render/index.js
@@ -6,6 +6,7 @@ import * as tpl from './tpl'
import { markdown, sidebar, subSidebar, cover } from './compiler'
import { callHook } from '../init/lifecycle'
import { getBasePath, getPath, isAbsolutePath } from '../route/util'
+import { isPrimitive } from '../util/core'
function executeScript () {
const script = dom.findAll('.markdown-section>script')
@@ -47,6 +48,22 @@ function renderMain (html) {
}
}
+function renderNameLink (vm) {
+ const el = dom.getNode('.app-name-link')
+ const nameLink = vm.config.nameLink
+ const path = vm.route.path
+
+ if (!el) return
+
+ if (isPrimitive(vm.config.nameLink)) {
+ el.setAttribute('href', nameLink)
+ } else if (typeof nameLink === 'object') {
+ const match = Object.keys(nameLink).find(key => path.indexOf(key) > -1)
+
+ el.setAttribute('href', nameLink[match])
+ }
+}
+
export function renderMixin (proto) {
proto._renderTo = function (el, content, replace) {
const node = dom.getNode(el)
@@ -58,7 +75,7 @@ export function renderMixin (proto) {
this._renderTo('.sidebar-nav', sidebar(text, maxLevel))
const active = getAndActive('.sidebar-nav', true, true)
- loadSidebar && subSidebar(active, subMaxLevel)
+ subSidebar(loadSidebar ? active : '', subMaxLevel)
// bind event
this.activeLink = active
scrollActiveSidebar()
@@ -120,6 +137,8 @@ export function renderMixin (proto) {
proto._updateRender = function () {
markdown.update()
+ // render name link
+ renderNameLink(this)
}
}
diff --git a/src/core/render/tpl.js b/src/core/render/tpl.js
index 6f7915945..e2f1ec759 100644
--- a/src/core/render/tpl.js
+++ b/src/core/render/tpl.js
@@ -31,7 +31,7 @@ export function main (config) {
'' +
'')
diff --git a/src/core/route/index.js b/src/core/route/index.js
index 7c4061ea2..09a14f929 100644
--- a/src/core/route/index.js
+++ b/src/core/route/index.js
@@ -34,6 +34,7 @@ let lastRoute = {}
export function initRoute (vm) {
normalize()
lastRoute = vm.route = parse()
+ vm._updateRender()
on('hashchange', _ => {
normalize()
diff --git a/src/core/route/util.js b/src/core/route/util.js
index 3f742c86b..cfdd2a9ee 100644
--- a/src/core/route/util.js
+++ b/src/core/route/util.js
@@ -45,8 +45,12 @@ export const isAbsolutePath = cached(path => {
return /(:|(\/{2}))/.test(path)
})
-export const getRoot = cached(path => {
- return /\/$/g.test(path) ? path : path.match(/(\S*\/)[^\/]+$/)[1]
+export const getParentPath = cached(path => {
+ return /\/$/g.test(path)
+ ? path
+ : (path = path.match(/(\S*\/)[^\/]+$/))
+ ? path[1]
+ : ''
})
export const cleanPath = cached(path => {
diff --git a/src/plugins/search/component.js b/src/plugins/search/component.js
index 524448c8e..219fc8dcd 100644
--- a/src/plugins/search/component.js
+++ b/src/plugins/search/component.js
@@ -1,6 +1,7 @@
import { search } from './search'
let dom
+let NO_DATA_TEXT = ''
function style () {
const code = `
@@ -98,7 +99,7 @@ function bindEvents () {
})
$panel.classList.add('show')
- $panel.innerHTML = html || '
No Results!
' + $panel.innerHTML = html || `${NO_DATA_TEXT}
` } let timeId @@ -122,6 +123,15 @@ function updatePlaceholder (text, path) { } } +function updateNoData (text, path) { + if (typeof text === 'string') { + NO_DATA_TEXT = text + } else { + const match = Object.keys(text).find(key => path.indexOf(key) > -1) + NO_DATA_TEXT = text[match] + } +} + export function init (opts) { dom = Docsify.dom style() @@ -131,5 +141,6 @@ export function init (opts) { export function update (opts, vm) { updatePlaceholder(opts.placeholder, vm.route.path) + updateNoData(opts.noData, vm.route.path) } diff --git a/src/plugins/search/index.js b/src/plugins/search/index.js index e1962793f..6b9d3e167 100644 --- a/src/plugins/search/index.js +++ b/src/plugins/search/index.js @@ -3,6 +3,7 @@ import { init as initSearch } from './search' const CONFIG = { placeholder: 'Type to search', + noData: 'No Results!', paths: 'auto', maxAge: 86400000 // 1 day } @@ -17,6 +18,7 @@ const install = function (hook, vm) { CONFIG.paths = Array.isArray(opts.paths) ? opts.paths : 'auto' CONFIG.maxAge = util.isPrimitive(opts.maxAge) ? opts.maxAge : CONFIG.maxAge CONFIG.placeholder = opts.placeholder || CONFIG.placeholder + CONFIG.noData = opts.noData || CONFIG.noData } const isAuto = CONFIG.paths === 'auto'