bump 1.5.0

Author: QingWei-Li

docs/_coverpage.md

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

lib/docsify.js

@@ -118,6 +118,7 @@ function slugify (string) {
   var re = /[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,.\/:;<=>?@\[\]^`{|}~]/g;
   var maintainCase = false;
   var replacement = '-';
+
   slugify.occurrences = slugify.occurrences || {};
 
   if (typeof string !== 'string') { return '' }
@@ -143,6 +144,27 @@ function slugify (string) {
   return slug
 }
 
+slugify.clear = function () {
+  slugify.occurrences = {};
+};
+
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+var merge = Object.assign || function (to) {
+  var arguments$1 = arguments;
+
+  for (var i = 1; i < arguments.length; i++) {
+    var from = Object(arguments$1[i]);
+
+    for (var key in from) {
+      if (hasOwnProperty.call(from, key)) {
+        to[key] = from[key];
+      }
+    }
+  }
+
+  return to
+};
+
 /**
  * Active sidebar when scroll
  * @link https://buble.surge.sh/
@@ -2411,50 +2433,66 @@ function tree (toc, tpl) {
 }
 
 var OPTIONS$1 = {};
+var markdown = marked;
+var toc = [];
 var CACHE = {};
 
 var renderTo = function (dom, content) {
   dom = typeof dom === 'object' ? dom : document.querySelector(dom);
   dom.innerHTML = content;
+  slugify.clear();
 
   return dom
 };
-var toc = [];
-var renderer = new marked.Renderer();
 
 /**
- * render anchor tag
- * @link https://github.com/chjj/marked#overriding-renderer-methods
+ * init render
+ * @param  {Object} options
  */
-renderer.heading = function (text, level) {
-  var slug = slugify(text);
-  var route = '';
+function init (options) {
+  OPTIONS$1 = options;
 
-  if (OPTIONS$1.router) {
-    route = "#/" + (getRoute());
-  }
+  var renderer = new marked.Renderer();
+  /**
+   * render anchor tag
+   * @link https://github.com/chjj/marked#overriding-renderer-methods
+   */
+  renderer.heading = function (text, level) {
+    var slug = slugify(text);
+    var route = '';
+
+    if (OPTIONS$1.router) {
+      route = "#/" + (getRoute());
+    }
 
-  toc.push({ level: level, slug: (route + "#" + (encodeURIComponent(slug))), title: text });
+    toc.push({ level: level, slug: (route + "#" + (encodeURIComponent(slug))), title: text });
 
-  return ("<h" + level + " id=\"" + slug + "\"><a href=\"" + route + "#" + slug + "\" data-id=\"" + slug + "\" class=\"anchor\"><span>" + text + "</span></a></h" + level + ">")
-};
-// highlight code
-renderer.code = function (code, lang) {
-  if ( lang === void 0 ) lang = '';
+    return ("<h" + level + " id=\"" + slug + "\"><a href=\"" + route + "#" + slug + "\" data-id=\"" + slug + "\" class=\"anchor\"><span>" + text + "</span></a></h" + level + ">")
+  };
+  // highlight code
+  renderer.code = function (code, lang) {
+    if ( lang === void 0 ) lang = '';
 
-  var hl = prism.highlight(code, prism.languages[lang] || prism.languages.markup)
-    .replace(/{{/g, '<span>{{</span>');
+    var hl = prism.highlight(code, prism.languages[lang] || prism.languages.markup)
+      .replace(/{{/g, '<span>{{</span>');
 
-  return ("<pre data-lang=\"" + lang + "\"><code class=\"lang-" + lang + "\">" + hl + "</code></pre>")
-};
-renderer.link = function (href, title, text) {
-  if (OPTIONS$1.router && !/:/.test(href)) {
-    href = ("#/" + href).replace(/\/\//g, '/');
-  }
+    return ("<pre data-lang=\"" + lang + "\"><code class=\"lang-" + lang + "\">" + hl + "</code></pre>")
+  };
+  renderer.link = function (href, title, text) {
+    if (OPTIONS$1.router && !/:/.test(href)) {
+      href = ("#/" + href).replace(/\/\//g, '/');
+    }
 
-  return ("<a href=\"" + href + "\" title=\"" + (title || '') + "\">" + text + "</a>")
-};
-marked.setOptions({ renderer: renderer });
+    return ("<a href=\"" + href + "\" title=\"" + (title || '') + "\">" + text + "</a>")
+  };
+
+  if (typeof OPTIONS$1.markdown === 'function') {
+    markdown.setOptions({ renderer: renderer });
+    markdown = OPTIONS$1.markdown.call(this, markdown);
+  } else {
+    markdown.setOptions(merge({ renderer: renderer }, OPTIONS$1.markdown));
+  }
+}
 
 /**
  * App
@@ -2483,7 +2521,7 @@ function renderApp (dom, replace) {
  * article
  */
 function renderArticle (content) {
-  renderTo('article', content ? marked(content) : 'not found');
+  renderTo('article', content ? markdown(content) : 'not found');
   if (!OPTIONS$1.sidebar && !OPTIONS$1.loadSidebar) { renderSidebar(); }
 
   if (content && typeof Vue !== 'undefined' && typeof Vuep !== 'undefined') {
@@ -2500,7 +2538,7 @@ function renderNavbar (content) {
   if (CACHE.navbar && CACHE.navbar === content) { return }
   CACHE.navbar = content;
 
-  if (content) { renderTo('nav', marked(content)); }
+  if (content) { renderTo('nav', markdown(content)); }
   activeLink('nav');
 }
 
@@ -2511,7 +2549,7 @@ function renderSidebar (content) {
   var html;
 
   if (content) {
-    html = marked(content);
+    html = markdown(content);
   } else if (OPTIONS$1.sidebar) {
     html = tree(OPTIONS$1.sidebar, '<ul>');
   } else {
@@ -2544,7 +2582,7 @@ function renderCover (content) {
   if (renderCover.rendered) { return }
 
   // render cover
-  var html = marked(content);
+  var html = markdown(content);
   var match = html.trim().match('<p><img[^s]+src="(.*?)"[^a]+alt="(.*?)"></p>$');
 
   // render background
@@ -2603,15 +2641,7 @@ function renderLoading (ref) {
   }
 }
 
-/**
- * Load Config
- * @param  {Object} options
- */
-function config (options) {
-  OPTIONS$1 = options;
-}
-
-var OPTIONS = {
+var OPTIONS = merge({
   el: '#app',
   repo: '',
   maxLevel: 6,
@@ -2625,7 +2655,7 @@ var OPTIONS = {
   coverpage: '',
   basePath: '',
   auto2top: false
-};
+}, window.$docsify);
 var script = document.currentScript || [].slice.call(document.getElementsByTagName('script')).pop();
 
 // load configuration for script attribute
@@ -2641,7 +2671,7 @@ if (script) {
 }
 
 // load options
-config(OPTIONS);
+init(OPTIONS);
 
 var cacheRoute = null;
 var cacheXhr = null;
@@ -2701,7 +2731,10 @@ var Docsify = function () {
   var dom = document.querySelector(OPTIONS.el) || document.body;
   var replace = dom !== document.body;
   var main = function () {
-    mainRender(function (_) { return scrollIntoView(); });
+    mainRender(function (_) {
+      scrollIntoView();
+      activeLink('nav');
+    });
   };
 
   // Render app