From 44a255103c05132c8e706f637951c0ed1f56a32b Mon Sep 17 00:00:00 2001
From: "cinwell.li" <cinwell.li@gmail.com>
Date: Tue, 13 Dec 2016 22:10:58 +0800
Subject: [PATCH] Fix/1.0.2 (#25)

* Fix regular expression, fixed #23

* Fix repeat binding events

* Add content cache

* Add changelog
---
 CHANGELOG.md       |  5 +++++
 src/event.js       | 19 +++++++++----------
 src/index.js       | 35 +++++++++++++++++++++++++++--------
 src/render.js      |  7 ++++++-
 src/themes/vue.css |  2 +-
 5 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71e9d88..ca7f2eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.0.2
+### Bug fixes
+- Fix binding events bug, fixed #24
+- Fix regular expression, fixed #23
+
 ## 1.0.1
 ### Bug fixes
 - `img` style
diff --git a/src/event.js b/src/event.js
index b71e902..fda0205 100644
--- a/src/event.js
+++ b/src/event.js
@@ -39,19 +39,18 @@ export function scrollActiveSidebar () {
     }
   }
 
-  document.querySelector('main .content').addEventListener('scroll', highlight)
+  const dom = document.querySelector('main .content')
+  dom.removeEventListener('scroll', highlight)
+  dom.addEventListener('scroll', highlight)
   highlight()
+}
 
-  function scrollIntoView () {
-    const id = window.location.hash.match(/#[^#\/]+$/g)
-    if (!id || !id.length) return
-    const section = document.querySelector(id[0])
+export function scrollIntoView () {
+  const id = window.location.hash.match(/#[^#\/]+$/g)
+  if (!id || !id.length) return
+  const section = document.querySelector(id[0])
 
-    if (section) section.scrollIntoView()
-  }
-
-  window.addEventListener('hashchange', scrollIntoView)
-  scrollIntoView()
+  if (section) section.scrollIntoView()
 }
 
 /**
diff --git a/src/index.js b/src/index.js
index d0dfc74..f7063e4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,4 +1,5 @@
 import { load, camel2kebab, isNil, getRoute } from './util'
+import { activeLink, scrollIntoView } from './event'
 import * as render from './render'
 
 const OPTIONS = {
@@ -29,25 +30,37 @@ render.config(OPTIONS)
 
 let cacheRoute = null
 
-const mainRender = function () {
+const mainRender = function (cb) {
   const route = getRoute()
-  if (cacheRoute === route) return
-
+  if (cacheRoute === route) return cb()
+  let wait
   let basePath = cacheRoute = route
 
   if (!/\//.test(basePath)) {
     basePath = ''
   } else if (basePath && !/\/$/.test(basePath)) {
-    basePath = basePath.match(/(\S+\/)[^\/]+$/)[1]
+    basePath = basePath.match(/(\S*\/)[^\/]+$/)[1]
   }
 
   // Render markdown file
   load((!route || /\/$/.test(route)) ? `${route}README.md` : `${route}.md`)
-    .then(render.renderArticle, _ => render.renderArticle(null))
+    .then(result => {
+      render.renderArticle(result)
+      if (OPTIONS.loadSidebar) {
+        if (wait === false) cb()
+        wait = false
+      } else {
+        cb()
+      }
+    }, _ => render.renderArticle(null))
 
   // Render sidebar
   if (OPTIONS.loadSidebar) {
-    load(basePath + OPTIONS.loadSidebar).then(render.renderSidebar)
+    load(basePath + OPTIONS.loadSidebar).then(result => {
+      render.renderSidebar(result)
+      if (wait === false) cb()
+      wait = false
+    })
   }
 
   // Render navbar
@@ -59,13 +72,19 @@ const mainRender = function () {
 const Docsify = function () {
   const dom = document.querySelector(OPTIONS.el) || document.body
   const replace = dom !== document.body
+  const main = function () {
+    mainRender(_ => {
+      activeLink('aside.sidebar', true)
+      scrollIntoView()
+    })
+  }
 
   // Render app
   render.renderApp(dom, replace)
-  mainRender()
+  main()
   if (OPTIONS.router) {
     if (!/^#\//.test(window.location.hash)) window.location.hash = '#/'
-    window.addEventListener('hashchange', mainRender)
+    window.addEventListener('hashchange', main)
   }
 }
 
diff --git a/src/render.js b/src/render.js
index 680be9d..5c9b1d2 100644
--- a/src/render.js
+++ b/src/render.js
@@ -5,6 +5,7 @@ import { activeLink, scrollActiveSidebar, bindToggle } from './event'
 import { genTree, getRoute } from './util'
 
 let OPTIONS = {}
+const CACHE = {}
 
 const renderTo = function (dom, content) {
   dom = typeof dom === 'object' ? dom : document.querySelector(dom)
@@ -74,6 +75,8 @@ export function renderArticle (content) {
  * navbar
  */
 export function renderNavbar (content) {
+  if (CACHE['navbar'] === content) return
+  CACHE['navbar'] = content
   renderNavbar.rendered = true
 
   if (content) renderTo('nav', marked(content))
@@ -84,6 +87,8 @@ export function renderNavbar (content) {
  * sidebar
  */
 export function renderSidebar (content) {
+  if (CACHE['sidebar'] === content) return
+  CACHE['sidebar'] = content
   renderSidebar.rendered = true
 
   let isToc = false
@@ -98,7 +103,7 @@ export function renderSidebar (content) {
   }
 
   renderTo('aside.sidebar', content)
-  isToc ? scrollActiveSidebar() : activeLink('aside.sidebar', true)
+  if (isToc) scrollActiveSidebar()
   toc = []
 }
 
diff --git a/src/themes/vue.css b/src/themes/vue.css
index ccd59c9..efe0178 100644
--- a/src/themes/vue.css
+++ b/src/themes/vue.css
@@ -36,7 +36,7 @@ body {
 
   ul li.active>a {
     color: $color-primary;
-    font-weight: 500;
+    font-weight: 600;
   }
 }