chore: add changelog 4.3.15

CHANGELOG.md

@@ -1,3 +1,23 @@
+<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)
+
+
+### Bug Fixes
+
+* codesponsor style ([ab68268](https://github.com/QingWei-Li/docsify/commit/ab68268))
+
+
+
 <a name="4.3.13"></a>
 ## [4.3.13](https://github.com/QingWei-Li/docsify/compare/v4.3.12...v4.3.13) (2017-10-17)
 

docs/_coverpage.md

@@ -1,6 +1,6 @@
 ![logo](_media/icon.svg)
 
-# docsify <small>4.3.13</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.13';
+Docsify.version = '4.3.15';
 
 /**
  * Run Docsify

lib/plugins/codesponsor.js

@@ -16,7 +16,7 @@ function tpl (id, options) {
   var div = Docsify.dom.create('div');
 
   Docsify.dom.toggleClass(div, 'codesponsor');
-  div.innerHTML = "<iframe\n      scrolling=0\n      frameborder=0\n      width=250\n      height=250\n      id=\"code-sponsor-embed-iframe\"\n      src=\"https://app.codesponsor.io/widgets/" + id + "?" + (qs.join('&')) + "\">\n    </iframe>";
+  div.innerHTML = "<iframe\n      scrolling=0\n      frameborder=0\n      width=250\n      height=auto\n      style=\"max-height: 250px;\"\n      id=\"code-sponsor-embed-iframe\"\n      src=\"https://app.codesponsor.io/widgets/" + id + "?" + (qs.join('&')) + "\">\n    </iframe>";
 
   return div
 }

lib/plugins/codesponsor.min.js

@@ -1 +1 @@
-!function(){"use strict";function o(o,n){var i=[];for(var s in n)i.push(s+"="+n[s]);var e=Docsify.dom.create("div");return Docsify.dom.toggleClass(e,"codesponsor"),e.innerHTML='<iframe\n      scrolling=0\n      frameborder=0\n      width=250\n      height=250\n      id="code-sponsor-embed-iframe"\n      src="https://app.codesponsor.io/widgets/'+o+"?"+i.join("&")+'">\n    </iframe>',e}function n(n,i){var s=o(n,i);Docsify.dom.before(Docsify.dom.find("section.content"),s)}function i(){Docsify.dom.style("\n    .codesponsor {\n      position: relative;\n      float: right;\n      right: 10px;\n      top: 10px;\n    }\n\n    @media screen and (min-width: 1600px) {\n      body.sticky .codesponsor {\n        position: fixed;\n      }\n\n      .codesponsor {\n        position: absolute;\n        bottom: 10px;\n        top: auto;\n        float: none;\n      }\n    }\n  ")}var s={theme:"light",image:"show"},e=function(o,e){var t,r=e.config.codesponsor;"string"==typeof r?(t=r,r={}):t=r.id;var c=Docsify.util.merge(s,r);if(!t)throw Error("codesponsor plugin need id");Docsify.util.isMobile||o.ready(function(){i(),n(t,c)})};window.$docsify.plugins=[].concat(e,window.$docsify.plugins)}();
+!function(){"use strict";function o(o,n){var i=[];for(var e in n)i.push(e+"="+n[e]);var s=Docsify.dom.create("div");return Docsify.dom.toggleClass(s,"codesponsor"),s.innerHTML='<iframe\n      scrolling=0\n      frameborder=0\n      width=250\n      height=auto\n      style="max-height: 250px;"\n      id="code-sponsor-embed-iframe"\n      src="https://app.codesponsor.io/widgets/'+o+"?"+i.join("&")+'">\n    </iframe>',s}function n(n,i){var e=o(n,i);Docsify.dom.before(Docsify.dom.find("section.content"),e)}function i(){Docsify.dom.style("\n    .codesponsor {\n      position: relative;\n      float: right;\n      right: 10px;\n      top: 10px;\n    }\n\n    @media screen and (min-width: 1600px) {\n      body.sticky .codesponsor {\n        position: fixed;\n      }\n\n      .codesponsor {\n        position: absolute;\n        bottom: 10px;\n        top: auto;\n        float: none;\n      }\n    }\n  ")}var e={theme:"light",image:"show"},s=function(o,s){var t,r=s.config.codesponsor;"string"==typeof r?(t=r,r={}):t=r.id;var c=Docsify.util.merge(e,r);if(!t)throw Error("codesponsor plugin need id");Docsify.util.isMobile||o.ready(function(){i(),n(t,c)})};window.$docsify.plugins=[].concat(s,window.$docsify.plugins)}();

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "4.3.13",
+  "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.13"
+  "version": "4.3.15"
 }

packages/docsify-server-renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify-server-renderer",
-  "version": "4.3.13",
+  "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
   })

src/plugins/codesponsor.js

@@ -17,7 +17,8 @@ function tpl (id, options) {
       scrolling=0
       frameborder=0
       width=250
-      height=250
+      height=auto
+      style="max-height: 250px;"
       id="code-sponsor-embed-iframe"
       src="https://app.codesponsor.io/widgets/${id}?${qs.join('&')}">
     </iframe>`