-> v3.6.1

CHANGELOG.md

@@ -1,129 +1,114 @@
-# Changelog
 
-## 3.6.4 / 2017-04-28
-
-
-  * fix(util): correctly clean up duplicate slashes, fixed ([#153](https://github.com/QingWei-Li/docsify/issues/153)
-
-## 3.6.3 / 2017-04-25
-
-  * fix(external-script): script attrs
-
-## 3.6.2/ 2017-04-12
-
-  * feat(external-script): detect more than one script dom, fixed ([#146](https://github.com/QingWei-Li/docsify/issues/146)
-  * GA: Send hash instead of complete href (#147)
-
-## 3.6.1 / 2017-04-09
+# 3.6.1 / 2017-04-09
 
   * feat(event): Collapse the sidebar when click outside element in the small screen
 
-## 3.6.0 / 2017-04-09
+# 3.6.0 / 2017-04-09
 
   * feat(render): add mergeNavbar option, close ([#125](https://github.com/QingWei-Li/docsify/issues/125)
 
-## 3.5.2/ 2017-04-05
+# 3.5.2/ 2017-04-05
 
   * add optional current route param to toURL and use it to properly compose local anchor links
   * fix code style by removing semicolons
   * in toURL test for anchor links and if so prepend the currentPath to the generated path. fixes ([#142](https://github.com/QingWei-Li/docsify/issues/142))
 
-## 3.5.1 / 2017-03-25
+# 3.5.1 / 2017-03-25
 
   * fix: .md file extension regex
 
-## 3.5.0 / 2017-03-25
+# 3.5.0 / 2017-03-25
 
   * feat(route): auto remove .md extension
   * fix: adjust display on small screens [@jrappen](https://github.com/jrappen)
   * fix: navbar labels for German [@jrappen](https://github.com/jrappen)
 
-## 3.4.4 / 2017-03-17
+# 3.4.4 / 2017-03-17
 
   * fix(search): fix input style
   * fix search plugin match bug
 
-## 3.4.3 / 2017-03-16
+# 3.4.3 / 2017-03-16
 
   * Add ability to ignore headers when generating toc ([#127](https://github.com/QingWei-Li/docsify/issues/127) [@christopherwk210](https://github.com/christopherwk210))
   * fix external-script not inserting script at right place [@Leopoldthecoder](https://github.com/Leopoldthecoder)
   * add German docs [@jrappen](https://github.com/jrappen)
 
-## 3.4.2 / 2017-03-11
+# 3.4.2 / 2017-03-11
 
 * feat(emojify): add no-emoji option
 
-## 3.4.1 / 2017-03-10
+# 3.4.1 / 2017-03-10
 
 * fix(dom): Disable the dom cache when vue is present, fixed [#119](https://github.com/QingWei-Li/docsify/issues/119)
 * update english docs, [@jrappen](https://github.com/jrappen)
 
-## 3.4.0 / 2017-03-09
+# 3.4.0 / 2017-03-09
 
 * feat(zoom-image): add plugin
 
-## 3.3.0 / 2017-03-07
+# 3.3.0 / 2017-03-07
 
 * add front-matter plugin
 * add external-script plugin, [@Leopoldthecoder](https://github.com/Leopoldthecoder)
 * Fix nav showing while loading ([#112](https://github.com/QingWei-Li/docsify/issues/112))
 
-## 3.2.0 / 2017-02-28
+# 3.2.0 / 2017-02-28
 
 * fix(render): Toc rendering error, fixed [#106](https://github.com/QingWei-Li/docsify/issues/106)
 * feat(search): Localization for no data tip, close [#103](https://github.com/QingWei-Li/docsify/issues/103)
 * fix(fetch): load sidebar and navbar for parent path, fixed [#100](https://github.com/QingWei-Li/docsify/issues/100)
 * feat(render) nameLink for each route, fixed [#99](https://github.com/QingWei-Li/docsify/issues/99)
 
-## 3.1.2 / 2017-02-27
+# 3.1.2 / 2017-02-27
 
 * fix(search): dont search nameLink, fixed [#102](https://github.com/QingWei-Li/docsify/issues/102)
 
-## 3.1.1 / 2017-02-24
+# 3.1.1 / 2017-02-24
 
 * fix(search): dont search nameLink, fixed [#102](https://github.com/QingWei-Li/docsify/issues/102)
 * fix(render): custom cover background image
 * fix(tpl): extra character, fixed [#101](https://github.com/QingWei-Li/docsify/issues/101)
 
-## 3.1.0 / 2017-02-22
+# 3.1.0 / 2017-02-22
 
 * fix(search): incorrect anchor link, fixed [#90](https://github.com/QingWei-Li/docsify/issues/90)
 * feat(emoji): add emoji plugin
 
-## 3.0.5 / 2017-02-21
+# 3.0.5 / 2017-02-21
 
 * feat(pwa): add sw.js
 * fix(layout.css): loading style
 * fix(event): highlight sidebar when clicked, fixed [#86](https://github.com/QingWei-Li/docsify/issues/86)
 * fix(gen-tree): cache toc list, fixed [#88](https://github.com/QingWei-Li/docsify/issues/88)
 
-## 3.0.4 / 2017-02-20
+# 3.0.4 / 2017-02-20
 
 * fix(render): execute script
 * fix(render): disable rendering sub list when loadSidebar is false
 
-## 3.0.3 / 2017-02-19
+# 3.0.3 / 2017-02-19
 
 * fixed look of links in blockquote
 * fix(scroll) highlight bug
 
-## 3.0.2 / 2017-02-19
+# 3.0.2 / 2017-02-19
 
 * fix(search): add lazy input
 * fix(compiler): link
 
-## 3.0.1 / 2017-02-19
+# 3.0.1 / 2017-02-19
 
 * fix(route): empty alias
 
-## 3.0.0 / 2017-02-19
+# 3.0.0 / 2017-02-19
 
-##### Breaking change
+#### Breaking change
 
 * Not support IE9
 * The route becomes: `/#/page?id=slug`. The previous route will be redirected
 
-##### Features
+#### Features
 
 * Faster rendering
 * Clearer source code

README.md

@@ -64,8 +64,6 @@ These open-source projects are using docsify to generate their sites. Pull reque
 | [Vudash](http://vudash.github.io/vudash/) | Powerful, Flexible, Open Source dashboards for anything |
 | [Trilogy](http://trilogy.js.org) | No-hassle SQLite with a Promise-based, document store style API. |
 | [Mybatis-Plus](http://mp.baomidou.com/) | An enhanced toolkit of Mybatis to simplify development |
-| [JS MythBusters](https://mythbusters.js.org) | An optimization handbook from a high level point of view. |
-| [hire-me](https://fvcproductions.github.io/hire-me) | A path to getting an awesome tech gig. |
 
 ## Similar projects
 

docs/cdn.md

@@ -44,7 +44,4 @@ Alternatively, use [compressed files](#compressed-files).
 
 ## Other CDN
 
-- http://www.bootcdn.cn/docsify
-- http://www.jsdelivr.com/projects/docsify
-- https://cdnjs.com/libraries/docsify
-
+[jsDelivr](http://www.jsdelivr.com/projects/docsify) is available.

docs/de-de/cdn.md

@@ -44,6 +44,4 @@ Alternativ kannst du auch die [komprimierten Dateien](#komprimierte-dateien) ver
 
 ## Andere CDN
 
-- http://www.bootcdn.cn/docsify
-- http://www.jsdelivr.com/projects/docsify
-- https://cdnjs.com/libraries/docsify
+[jsDelivr](http://www.jsdelivr.com/projects/docsify) ist auch verfügbar.

docs/zh-cn/cdn.md

@@ -44,6 +44,5 @@ JS 的压缩文件是原有文件路径的基础上加 `.min`后缀
 
 ## 其他 CDN
 
-- http://www.bootcdn.cn/docsify
-- http://www.jsdelivr.com/projects/docsify
-- https://cdnjs.com/libraries/docsify
+[jsDelivr](http://www.jsdelivr.com/projects/docsify) 也是可用的，具体用法参考其文档。
+

lib/docsify.js

@@ -314,7 +314,7 @@ var getParentPath = cached(function (path) {
 });
 
 var cleanPath = cached(function (path) {
-  return path.replace(/([^:])\/{2,}/g, '$1/')
+  return path.replace(/\/+/g, '/')
 });
 
 function replaceHash (path) {

lib/plugins/external-script.js

@@ -4,21 +4,15 @@ this.D = this.D || {};
 
 function handleExternalScript () {
   var container = Docsify.dom.getNode('#main');
-  var scripts = Docsify.dom.findAll(container, 'script');
+  var script = Docsify.dom.find(container, 'script');
 
-  for (var i = scripts.length; i--;) {
-    var script = scripts[i];
+  if (script && script.src) {
+    var newScript = document.createElement('script');['src', 'async', 'defer'].forEach(function (attribute) {
+      newScript[attribute] = script[attribute];
+    });
 
-    if (script && script.src) {
-      var newScript = document.createElement('script');
-
-      Array.prototype.slice.call(script.attributes).forEach(function (attribute) {
-        newScript[attribute.name] = attribute.value;
-      });
-
-      script.parentNode.insertBefore(newScript, script);
-      script.parentNode.removeChild(script);
-    }
+    script.parentNode.insertBefore(newScript, script);
+    script.parentNode.removeChild(script);
   }
 }
 

lib/plugins/external-script.min.js

@@ -1 +1 @@
-this.D=this.D||{},function(){"use strict";function e(){for(var e=Docsify.dom.getNode("#main"),i=Docsify.dom.findAll(e,"script"),o=i.length;o--;){var t=i[o];if(t&&t.src){var n=document.createElement("script");Array.prototype.slice.call(t.attributes).forEach(function(e){n[e.name]=e.value}),t.parentNode.insertBefore(n,t),t.parentNode.removeChild(t)}}}var i=function(i){i.doneEach(e)};window.$docsify.plugins=[].concat(i,window.$docsify.plugins)}();
+this.D=this.D||{},function(){"use strict";function i(){var i=Docsify.dom.getNode("#main"),n=Docsify.dom.find(i,"script");if(n&&n.src){var o=document.createElement("script");["src","async","defer"].forEach(function(i){o[i]=n[i]}),n.parentNode.insertBefore(o,n),n.parentNode.removeChild(n)}}var n=function(n){n.doneEach(i)};window.$docsify.plugins=[].concat(n,window.$docsify.plugins)}();

lib/plugins/ga.js

@@ -23,7 +23,7 @@ function init (id) {
 
 function collect () {
   init(window.$docsify.ga);
-  window.ga('set', 'page', location.hash);
+  window.ga('set', 'page', location.href);
   window.ga('send', 'pageview');
 }
 

lib/plugins/ga.min.js

@@ -1 +1 @@
-this.D=this.D||{},function(){"use strict";function n(){var n=document.createElement("script");n.async=!0,n.src="https://www.google-analytics.com/analytics.js",document.body.appendChild(n)}function o(o){window.ga||(n(),window.ga=window.ga||function(){(window.ga.q=window.ga.q||[]).push(arguments)},window.ga.l=Number(new Date),window.ga("create",o,"auto"))}function i(){o(window.$docsify.ga),window.ga("set","page",location.hash),window.ga("send","pageview")}var w=function(n){return window.$docsify.ga?void n.beforeEach(i):void console.error("[Docsify] ga is required.")};window.$docsify.plugins=[].concat(w,window.$docsify.plugins)}();
+this.D=this.D||{},function(){"use strict";function n(){var n=document.createElement("script");n.async=!0,n.src="https://www.google-analytics.com/analytics.js",document.body.appendChild(n)}function o(o){window.ga||(n(),window.ga=window.ga||function(){(window.ga.q=window.ga.q||[]).push(arguments)},window.ga.l=Number(new Date),window.ga("create",o,"auto"))}function i(){o(window.$docsify.ga),window.ga("set","page",location.href),window.ga("send","pageview")}var w=function(n){return window.$docsify.ga?void n.beforeEach(i):void console.error("[Docsify] ga is required.")};window.$docsify.plugins=[].concat(w,window.$docsify.plugins)}();

package.json

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

src/core/route/util.js

@@ -54,5 +54,5 @@ export const getParentPath = cached(path => {
 })
 
 export const cleanPath = cached(path => {
-  return path.replace(/([^:])\/{2,}/g, '$1/')
+  return path.replace(/\/+/g, '/')
 })

src/plugins/external-script.js

@@ -1,20 +1,16 @@
 function handleExternalScript () {
   const container = Docsify.dom.getNode('#main')
-  const scripts = Docsify.dom.findAll(container, 'script')
+  const script = Docsify.dom.find(container, 'script')
 
-  for (let i = scripts.length; i--;) {
-    const script = scripts[i]
+  if (script && script.src) {
+    const newScript = document.createElement('script')
 
-    if (script && script.src) {
-      const newScript = document.createElement('script')
+    ;['src', 'async', 'defer'].forEach(attribute => {
+      newScript[attribute] = script[attribute]
+    })
 
-      Array.prototype.slice.call(script.attributes).forEach(attribute => {
-        newScript[attribute.name] = attribute.value
-      })
-
-      script.parentNode.insertBefore(newScript, script)
-      script.parentNode.removeChild(script)
-    }
+    script.parentNode.insertBefore(newScript, script)
+    script.parentNode.removeChild(script)
   }
 }
 

src/plugins/ga.js

@@ -19,7 +19,7 @@ function init (id) {
 
 function collect () {
   init(window.$docsify.ga)
-  window.ga('set', 'page', location.hash)
+  window.ga('set', 'page', location.href)
   window.ga('send', 'pageview')
 }