chore: add changelog 4.3.4

.travis.yml

@@ -1,9 +1,3 @@
 sudo: false
-cache:
-  directories:
-    - $HOME/.yarn-cache
 language: node_js
 node_js: stable
-os:
-  - linux
-  - osx

CHANGELOG.md

@@ -1,3 +1,43 @@
+<a name="4.3.4"></a>
+## [4.3.4](https://github.com/QingWei-Li/docsify/compare/v4.3.3...v4.3.4) (2017-09-07)
+
+
+### Bug Fixes
+
+* scroll position issue, fixed [#234](https://github.com/QingWei-Li/docsify/issues/234) ([388ed3d](https://github.com/QingWei-Li/docsify/commit/388ed3d))
+
+
+
+<a name="4.3.3"></a>
+## [4.3.3](https://github.com/QingWei-Li/docsify/compare/v4.3.2...v4.3.3) (2017-09-06)
+
+
+### Bug Fixes
+
+* **buble.css:** tweaks code block style, fixed [#249](https://github.com/QingWei-Li/docsify/issues/249) ([9d43051](https://github.com/QingWei-Li/docsify/commit/9d43051))
+
+
+### Features
+
+* add doc for react and vue demo box plugin ([#247](https://github.com/QingWei-Li/docsify/issues/247)) ([f0aca19](https://github.com/QingWei-Li/docsify/commit/f0aca19))
+
+
+
+<a name="4.3.2"></a>
+## [4.3.2](https://github.com/QingWei-Li/docsify/compare/v4.3.1...v4.3.2) (2017-09-01)
+
+
+### Bug Fixes
+
+* sidebar highlight ([f82f419](https://github.com/QingWei-Li/docsify/commit/f82f419))
+
+
+### Features
+
+* add Edit on github plugin (thanks [@njleonzhang](https://github.com/njleonzhang)) ([a0e1ea8](https://github.com/QingWei-Li/docsify/commit/a0e1ea8))
+
+
+
 <a name="4.3.1"></a>
 ## [4.3.1](https://github.com/QingWei-Li/docsify/compare/v4.2.9...v4.3.1) (2017-08-30)
 

docs/_coverpage.md

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

docs/de-de/plugins.md

@@ -96,3 +96,7 @@ Medium's Bilderzoom. Basierend auf [zoom-image](https://github.com/egoist/zoom-i
 ```html
 <script src="//unpkg.com/docsify/lib/plugins/zoom-image.min.js"></script>
 ```
+
+## Edit on github
+
+Add `Edit on github` button on every pages. provided by 3rd party, check [document](https://github.com/njleonzhang/docsify-edit-on-github)

docs/plugins.md

@@ -96,3 +96,15 @@ Medium's Image Zoom. Based on [zoom-image](https://github.com/egoist/zoom-image)
 ```html
 <script src="//unpkg.com/docsify/lib/plugins/zoom-image.min.js"></script>
 ```
+
+## Edit on github
+
+Add `Edit on github` button on every pages. provided by 3rd party, check [document](https://github.com/njleonzhang/docsify-edit-on-github)
+
+## Demo code with instant preview and jsfiddle integration
+
+With this plugin, sample code can be rendered on the page instantly, so that the readers can see the preview immediately.
+When readers expand the demo box, the source code and description are shown there. if they click the button `Try in Jsfiddle`,
+`jsfiddle.net` will be open with the code of this sample, which allow readers to revise the code and try on their own.
+
+[Vue](https://njleonzhang.github.io/docsify-demo-box-vue/) and [React](https://njleonzhang.github.io/docsify-demo-box-react/) are both supported.

docs/zh-cn/plugins.md

@@ -90,3 +90,8 @@ Medium's 风格的图片缩放插件. 基于 [zoom-image](https://github.com/ego
 ```html
 <script src="//unpkg.com/docsify/lib/plugins/zoom-image.js"></script>
 ```
+
+
+## Edit on github
+
+Add `Edit on github` button on every pages. provided by 3rd party, check [document](https://github.com/njleonzhang/docsify-edit-on-github)

lib/docsify.js

@@ -80,7 +80,7 @@ var config = merge({
   mergeNavbar: false,
   formatUpdated: '',
   externalLinkTarget: '_blank',
-  routerModel: 'hash',
+  routerMode: 'hash',
   noCompileLinks: []
 }, window.$docsify);
 
@@ -3130,6 +3130,7 @@ var nav = {};
 var hoverOver = false;
 var scroller = null;
 var enableScrollEvent = true;
+var coverHeight = 0;
 
 function scrollTo (el) {
   if (scroller) { scroller.stop(); }
@@ -3151,7 +3152,7 @@ function highlight () {
   var wrap = find(sidebar, '.sidebar-nav');
   var active = find(sidebar, 'li.active');
   var doc = document.documentElement;
-  var top = doc && doc.scrollTop || document.body.scrollTop;
+  var top = (doc && doc.scrollTop || document.body.scrollTop) - coverHeight;
   var last;
 
   for (var i = 0, len = anchors.length; i < len; i += 1) {
@@ -3195,7 +3196,8 @@ function highlight () {
 }
 
 function scrollActiveSidebar (router) {
-  if (isMobile) { return }
+  var cover = find('.cover.show');
+  coverHeight = cover ? cover.offsetHeight : 0;
 
   var sidebar = getNode('.sidebar');
   var lis = findAll(sidebar, 'li');
@@ -3210,9 +3212,11 @@ function scrollActiveSidebar (router) {
       href = router.parse(href).query.id;
     }
 
-    nav[decodeURIComponent(href)] = li;
+    if (href) { nav[decodeURIComponent(href)] = li; }
   }
 
+  if (isMobile) { return }
+
   off('scroll', highlight);
   on('scroll', highlight);
   on(sidebar, 'mouseover', function () { hoverOver = true; });
@@ -3220,6 +3224,8 @@ function scrollActiveSidebar (router) {
 }
 
 function scrollIntoView (id) {
+  if (!id) { return }
+
   var section = find('#' + id);
   section && scrollTo(section);
 
@@ -3944,7 +3950,7 @@ initGlobalAPI();
 /**
  * Version
  */
-Docsify.version = '4.3.1';
+Docsify.version = '4.3.4';
 
 /**
  * Run Docsify

package.json

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

packages/docsify-server-renderer/package.json

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

src/core/config.js

@@ -21,7 +21,7 @@ const config = merge({
   mergeNavbar: false,
   formatUpdated: '',
   externalLinkTarget: '_blank',
-  routerModel: 'hash',
+  routerMode: 'hash',
   noCompileLinks: []
 }, window.$docsify)
 

src/core/event/scroll.js

@@ -6,6 +6,7 @@ const nav = {}
 let hoverOver = false
 let scroller = null
 let enableScrollEvent = true
+let coverHeight = 0
 
 function scrollTo (el) {
   if (scroller) scroller.stop()
@@ -27,7 +28,7 @@ function highlight () {
   const wrap = dom.find(sidebar, '.sidebar-nav')
   let active = dom.find(sidebar, 'li.active')
   const doc = document.documentElement
-  const top = doc && doc.scrollTop || document.body.scrollTop
+  const top = (doc && doc.scrollTop || document.body.scrollTop) - coverHeight
   let last
 
   for (let i = 0, len = anchors.length; i < len; i += 1) {
@@ -71,7 +72,8 @@ function highlight () {
 }
 
 export function scrollActiveSidebar (router) {
-  if (isMobile) return
+  const cover = dom.find('.cover.show')
+  coverHeight = cover ? cover.offsetHeight : 0
 
   const sidebar = dom.getNode('.sidebar')
   const lis = dom.findAll(sidebar, 'li')
@@ -86,9 +88,11 @@ export function scrollActiveSidebar (router) {
       href = router.parse(href).query.id
     }
 
-    nav[decodeURIComponent(href)] = li
+    if (href) nav[decodeURIComponent(href)] = li
   }
 
+  if (isMobile) return
+
   dom.off('scroll', highlight)
   dom.on('scroll', highlight)
   dom.on(sidebar, 'mouseover', () => { hoverOver = true })
@@ -96,6 +100,8 @@ export function scrollActiveSidebar (router) {
 }
 
 export function scrollIntoView (id) {
+  if (!id) return
+
   const section = dom.find('#' + id)
   section && scrollTo(section)
 

src/themes/buble.css

@@ -226,6 +226,7 @@ $sidebar-width: 16rem;
   overflow: inherit;
   padding: 20px 0.8em 20px;
   position: relative;
+  white-space: inherit;
 }
 
 .markdown-section code::after, .markdown-section code::before {