chore: add changelog 4.3.15

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="4.3.15"></a>
+## [4.3.15](https://github.com/QingWei-Li/docsify/compare/v4.3.14...v4.3.15) (2017-10-20)
+
+
+### Bug Fixes
+
+* scroll active sidebar ([a2b8eae](https://github.com/QingWei-Li/docsify/commit/a2b8eae))
+
+
+
 <a name="4.3.14"></a>
 ## [4.3.14](https://github.com/QingWei-Li/docsify/compare/v4.3.13...v4.3.14) (2017-10-20)
 

docs/_coverpage.md

@@ -1,6 +1,6 @@
 ![logo](_media/icon.svg)
 
-# docsify <small>4.3.14</small>
+# docsify <small>4.3.15</small>
 
 > A magical documentation site generator.
 

lib/docsify.js

@@ -3182,7 +3182,7 @@ function scrollTo (el) {
     .begin();
 }
 
-function highlight () {
+function highlight (path) {
   if (!enableScrollEvent) { return }
   var sidebar = getNode('.sidebar');
   var anchors = findAll('.anchor');
@@ -3203,7 +3203,7 @@ function highlight () {
     }
   }
   if (!last) { return }
-  var li = nav[last.getAttribute('data-id')];
+  var li = nav[getNavKey(path, last.getAttribute('data-id'))];
 
   if (!li || li === active) { return }
 
@@ -3246,17 +3246,17 @@ function scrollActiveSidebar (router) {
     if (href !== '/') {
       var ref = router.parse(href);
       var id = ref.query.id;
-      var path = ref.path;
-      if (id) { href = getNavKey(path, id); }
+      var path$1 = ref.path;
+      if (id) { href = getNavKey(path$1, id); }
     }
 
     if (href) { nav[decodeURIComponent(href)] = li; }
   }
 
   if (isMobile) { return }
-
-  off('scroll', highlight);
-  on('scroll', highlight);
+  var path = router.getCurrentPath();
+  off('scroll', function () { return highlight(path); });
+  on('scroll', function () { return highlight(path); });
   on(sidebar, 'mouseover', function () {
     hoverOver = true;
   });
@@ -3990,7 +3990,7 @@ initGlobalAPI();
 /**
  * Version
  */
-Docsify.version = '4.3.14';
+Docsify.version = '4.3.15';
 
 /**
  * Run Docsify

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "4.3.14",
+  "version": "4.3.15",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "4.3.14",
+  "version": "4.3.15",
   "description": "A magical documentation generator.",
   "author": {
     "name": "qingwei-li",

packages/docsify-server-renderer/package-lock.json

@@ -37,5 +37,5 @@
       "integrity": "sha1-6DWIAbhrg7F1YNTjw4LXrvIQCUQ="
     }
   },
-  "version": "4.3.14"
+  "version": "4.3.15"
 }

packages/docsify-server-renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify-server-renderer",
-  "version": "4.3.14",
+  "version": "4.3.15",
   "description": "docsify server renderer",
   "author": {
     "name": "qingwei-li",

src/core/event/scroll.js

@@ -24,7 +24,7 @@ function scrollTo (el) {
     .begin()
 }
 
-function highlight () {
+function highlight (path) {
   if (!enableScrollEvent) return
   const sidebar = dom.getNode('.sidebar')
   const anchors = dom.findAll('.anchor')
@@ -45,7 +45,7 @@ function highlight () {
     }
   }
   if (!last) return
-  const li = nav[last.getAttribute('data-id')]
+  const li = nav[getNavKey(path, last.getAttribute('data-id'))]
 
   if (!li || li === active) return
 
@@ -94,9 +94,9 @@ export function scrollActiveSidebar (router) {
   }
 
   if (isMobile) return
-
-  dom.off('scroll', highlight)
-  dom.on('scroll', highlight)
+  const path = router.getCurrentPath()
+  dom.off('scroll', () => highlight(path))
+  dom.on('scroll', () => highlight(path))
   dom.on(sidebar, 'mouseover', () => {
     hoverOver = true
   })