fix: not found page

docsifyjs · Jul 9, 2017 · 9af8559 · 9af8559
1 parent 4492c3e
commit 9af8559
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/core/fetch/index.js b/src/core/fetch/index.js
@@ -28,17 +28,24 @@ export function fetchMixin (proto) {
     // Current page is html
     this.isHTML = /\.html$/g.test(path)
 
-    // Load main content
-    last.then((text, opt) => {
-      this._renderMain(text, opt)
+    const loadSideAndNav = () => {
       if (!loadSidebar) return cb()
 
       const fn = result => { this._renderSidebar(result); cb() }
 
       // Load sidebar
       loadNested(path, loadSidebar, fn, this, true)
+    }
+
+    // Load main content
+    last.then((text, opt) => {
+      this._renderMain(text, opt)
+      loadSideAndNav()
     },
-    _ => this._renderMain(null))
+    _ => {
+      this._renderMain(null)
+      loadSideAndNav()
+    })
 
     // Load nav
     loadNavbar &&

diff --git a/src/core/render/index.js b/src/core/render/index.js
@@ -117,6 +117,10 @@ export function renderMixin (proto) {
   }
 
   proto._renderMain = function (text, opt = {}) {
+    if (!text) {
+      return renderMain.call(this, text)
+    }
+
     callHook(this, 'beforeEach', text, result => {
       let html = this.isHTML ? result : this.compiler.compile(result)
       if (opt.updatedAt) {