-> v1.10.1

bump 1.10.1
Fix render emojis
2026-08-09 13:26:34 +10:00 · 2017-01-25 21:17:54 +08:00 · 2017-01-25 21:17:43 +08:00 · 2017-01-25 21:16:53 +08:00 · 2017-01-25 15:08:40 +08:00 · 2017-01-25 15:08:28 +08:00
23 changed files with 3895 additions and 135 deletions
@@ -1,5 +1,4 @@
 .DS_Store
 *.log
 node_modules
-yarn.lock
 /themes
@@ -1,3 +1,55 @@
+## 1.10.1
+### Bug fixes
+- Fix render emojis
+
+## 1.10.0
+### Features
+- Support emoji :laughing:
+
+## 1.9.0
+
+### Bug fixes
+- Destroys the vue instance when the route is changed
+
+### Features
+- Add `!>` and `?>` doc helper.
+
+### Break change
+- Remove `!` doc helper.
+
+## 1.8.0
+### Bug fixes
+- Using `v-pre` skip compilation.
+
+### Features
+- Execute script when vue exists.
+
+## 1.7.4
+### Bug fixes
+- Fix bugs caused by the previous version
+
+## 1.7.3
+### Bug fixes
+- Add `hr` style
+- Fixed option is an empty string
+
+## 1.7.2
+### Bug fixes
+- Fix sidebar click event in mobile browser.
+
+## 1.7.1
+### Bug fixes
+- Fix sidebar style in mobile browser.
+
+## 1.7.0
+
+### Bug fixes
+- Fixed custom cover background, fixed #52
+- Fixed sticky sidebar
+
+## Features
+- Add `name` and `nameLink`
+
 ## 1.6.1
 ### Bug fixes
 - Fixed sidebar bug when the coverpage exist
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2016 cinwell.li
+Copyright (c) 2016 - 2017 cinwell.li

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,7 @@
 - Simple and lightweight (~13kB gzipped)
 - Multiple themes
 - Not build static html files
+- Support emoji :laughing:

 ## Quick start
 Create a `index.html` and using `hash router`.
@@ -52,6 +53,9 @@ These open-source projects are using docsify to generate their sites. Pull reque
 - [docsify](https://docsify.js.org) - A magical documentation site generator.
 - [Snipaste](https://docs.snipaste.com/) - A new way to boost your productivity.
 - [puck](https://puck.zz173.com/) - A small & magical php framework.
+- [Samaritan](http://samaritan.stockdb.org) - An Algorithmic Trading Framework for Digital Currency.
+- [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.

 ## Similar projects
 - [docute](https://github.com/egoist/docute) - 📜 Effortlessly documentation done right
@@ -69,7 +73,7 @@ These open-source projects are using docsify to generate their sites. Pull reque
 ## Development

 ### prepare
-```shell
+```bash
 npm i && npm run dev
 open http://localhost:3000
 ```
@@ -8,5 +8,5 @@
 <body class="">
  <div id="app"></div>
 </body>
-<script src="/lib/docsify.js" data-repo="qingwei-li/docsify" data-auto2top data-sidebar-toggle data-router></script>
+<script src="/lib/docsify.js" data-repo="qingwei-li/docsify" data-name="docsify" data-auto2top data-sidebar-toggle data-router></script>
 </html>
@@ -2,7 +2,7 @@

 ### Create a project
 First create a project, then create a `docs` folder
-```shell
+```bash
 mkdir my-project && cd my-project
 mkdir docs && cd docs
 ```
@@ -26,7 +26,7 @@ Create a `index.html` file

 Create `README.md` as the main page

-```
+```markdown
 # Title

 ## blabla
@@ -41,20 +41,20 @@ Push code and activate **GitHub Pages** via your repo's settings
 Easy to setup and preview a docs.

 ### Install
-```shell
+```bash
 npm i docsify-cli -g
 ```

 ### Setup

 Setup a boilerplate docs
-```shell
+```bash
 docsify init docs
 ```

 ### Preview
 Preview and serve your docs using
-```shell
+```bash
 docsify serve docs
 ```

@@ -160,10 +160,10 @@ window.$docsify = {
 ### Doc Helpers
 #### p.tip

-'! ' add your content will rendered as `<p class="tip">content</p>`
+`!> ` add your content will rendered as `<p class="tip">content</p>`

 ```markdown
-! Important **information**
+!> Important **information**
 ```

 It will be rendered
@@ -174,9 +174,48 @@ It will be rendered

 e.g.

-! Important **information**
+!> Important **information**


+#### p.warn
+
+```markdown
+?> todo info
+```
+
+?> todo info
+
+### Combining Vue
+We can write the Vue syntax directly in the markdown file, when the Vue library is loaded into `index.html`. Default will automatically initialize a Vue instance, of course, we can also manually.
+
+index.html
+```html
+<script src="//unpkg.com/vue"></script>
+<script src="//unpkg.com/docsify" data-router></script>
+```
+
+```markdown
+<ul>
+  <li v-for="i in 10">{{ i }}</li>
+</ul>
+```
+
+Manual initialization
+
+```markdown
+<div>
+  <input type="text" v-model="msg">
+  <p>Hello, {{ msg }}</p>
+</div>
+
+<script>
+  new Vue({
+    el: 'main',
+    data: { msg: 'Docsify' }
+  })
+</script>
+```
+
 ## Options

 You can add configurations in the script tag attributes or with `window.$docsify`.
@@ -433,4 +472,35 @@ Generate cover page.
 window.$docsify = {
  coverpage: true
 }
-```
+```
+
+### name
+
+Project name. It is displayed in the sidebar.
+
+```html
+<script src="/lib/docsify.js" data-name="docsify"></script>
+```
+
+```js
+window.$docsify = {
+  name: 'docsify'
+}
+```
+
+### nameLink
+
+Name link. The default value is `window.location.pathname`.
+
+
+```html
+<script src="/lib/docsify.js" data-name-link="/"></script>
+```
+
+```js
+window.$docsify = {
+  nameLink: '/'
+}
+```
+
+
@@ -1,12 +1,13 @@
 ![logo](_media/icon.svg)

-# docsify <small>1.6.0</small>
+# docsify <small>1.10.0</small>

 > A magical documentation site generator.

 - Simple and lightweight (~13kB gzipped)
- Multiple themes
 - Not build static html files
+- Support emoji :laughing:
+- Multiple themes


 [GitHub](https://github.com/QingWei-Li/docsify/)
@@ -20,5 +20,8 @@
  data-max-level="4"
  data-sidebar-toggle
  data-coverpage
+  data-name="docsify"
  data-router></script>
+<script src="//unpkg.com/prismjs/components/prism-bash.min.js"></script>
+<script src="//unpkg.com/prismjs/components/prism-markdown.min.js"></script>
 </html>
@@ -8,7 +8,7 @@

 ### 创建项目
 新建一个空项目，接着创建一个 `docs` 目录并进入到 docs 目录下
-```shell
+```bash
 mkdir my-project && cd my-project
 mkdir docs && cd docs
 ```
@@ -46,20 +46,20 @@ mkdir docs && cd docs
 方便快速创建文档目录，会读取项目的 `package.json` 里的选项作为 docsify 的配置，支持本地预览。

 ### 安装
-```shell
+```bash
 npm i docsify-cli -g
 ```

 ### 初始化文档

 默认初始化在当前目录，推荐将文档放在 `docs` 目录下
-```shell
+```bash
 docsify init docs
 ```

 ### 启动本地服务
 启动一个 server 方便预览，打开 http://localhost:3000
-```shell
+```bash
 docsify serve docs
 ```

@@ -166,10 +166,10 @@ window.$docsify = {
 ### 文档助手
 #### 内置「提示」语法

-感叹号加空格，后面接内容，会渲染成带 tip 类名的段落。
+`!>`后面接内容，会渲染成带 tip 类名的段落。

 ```markdown
-! 提示信息，**支持其他 markdown 语法**
+!> 提示信息，**支持其他 markdown 语法**
 ```

 将被渲染成
@@ -180,7 +180,51 @@ window.$docsify = {

 效果

-! 适合显示醒目的内容
+!> 适合显示醒目的内容
+
+#### 内置「警示」语法
+
+`?>`后面接内容，会渲染成带 warn 类名的段落。
+
+```markdown
+?> 警示内容样式
+```
+
+效果
+
+?> 警示内容样式
+
+### 结合 Vue
+
+`index.html` 内引入 Vue 后，可以在文档里直接写 Vue 语法。默认会自己初始化一个 Vue 示例，当然我们也可以手动初始化一个实例。
+
+index.html
+```html
+<script src="//unpkg.com/vue"></script>
+<script src="//unpkg.com/docsify" data-router></script>
+```
+
+```markdown
+<ul>
+  <li v-for="i in 10">{{ i }}</li>
+</ul>
+```
+
+手动初始化示例
+
+```markdown
+<div>
+  <input type="text" v-model="msg">
+  <p>Hello, {{ msg }}</p>
+</div>
+
+<script>
+  new Vue({
+    el: 'main',
+    data: { msg: 'Docsify' }
+  })
+</script>
+```

 ## 配置参数

@@ -437,3 +481,33 @@ window.$docsify = {
  coverpage: true
 }
 ```
+
+
+### name
+
+项目名，将显示在侧边栏。
+
+```html
+<script src="/lib/docsify.js" data-name="docsify"></script>
+```
+
+```js
+window.$docsify = {
+  name: 'docsify'
+}
+```
+
+### nameLink
+
+项目名链接，默认为 `window.location.pathname`。
+
+```html
+<script src="/lib/docsify.js" data-name-link="/"></script>
+```
+
+```js
+window.$docsify = {
+  nameLink: '/'
+}
+```
+
@@ -168,6 +168,12 @@ var merge = Object.assign || function (to) {
  return to
 };

+function emojify (text) {
+  return text
+    .replace(/:(\S*?):/ig, '<img class="emoji" src="https://assets-cdn.github.com/images/icons/emoji/$1.png" alt="$1" />')
+    .replace(/__colon__/g, ':')
+}
+
 /**
 * Active sidebar when scroll
 * @link https://buble.surge.sh/
@@ -216,7 +222,7 @@ function scrollActiveSidebar () {

    li.classList.add('active');
    active = li;
-    !hoveredOverSidebar && sticky.isSticky && active.scrollIntoView();
+    !hoveredOverSidebar && !sticky.noSticky && active.scrollIntoView(false);
  }

  window.removeEventListener('scroll', highlight);
@@ -273,9 +279,9 @@ function bindToggle (dom) {

  if (isMobile()) {
    var sidebar = document.querySelector('aside.sidebar');
-    document.body.addEventListener('click', function (e) {
-      if (e.target !== dom && !dom.contains(e.target)) { body.classList.toggle('close'); }
-      if (sidebar.contains(e.target)) { setTimeout(function () { return activeLink(sidebar, true); }, 0); }
+    sidebar.addEventListener('click', function () {
+      body.classList.toggle('close');
+      setTimeout(function () { return activeLink(sidebar, true); }, 0);
    });
  }
 }
@@ -287,16 +293,16 @@ function scroll2Top (offset) {
 }

 function sticky () {
-  var dom = document.querySelector('section.cover');
-  var coverHeight = dom.getBoundingClientRect().height;
+  sticky.dom = sticky.dom || document.querySelector('section.cover');
+  var coverHeight = sticky.dom.getBoundingClientRect().height;

  return (function () {
-    if (window.pageYOffset >= coverHeight || dom.classList.contains('hidden')) {
+    if (window.pageYOffset >= coverHeight || sticky.dom.classList.contains('hidden')) {
      document.body.classList.add('sticky');
-      sticky.isSticky = true;
+      sticky.noSticky = false;
    } else {
      document.body.classList.remove('sticky');
-      sticky.isSticky = false;
+      sticky.noSticky = true;
    }
  })()
 }
@@ -1599,12 +1605,8 @@ marked.inlineLexer = InlineLexer.output;

 marked.parse = marked;

-if (typeof module !== 'undefined' && typeof exports === 'object') {
+{
  module.exports = marked;
-} else if (typeof define === 'function' && define.amd) {
-  define(function() { return marked; });
-} else {
-  this.marked = marked;
 }

 }).call(function() {
@@ -1822,6 +1824,9 @@ var _ = _self.Prism = {
 		_.hooks.run('before-sanity-check', env);

 		if (!env.code || !env.grammar) {
+			if (env.code) {
+				env.element.textContent = env.code;
+			}
 			_.hooks.run('complete', env);
 			return;
 		}
@@ -1899,9 +1904,16 @@ var _ = _self.Prism = {
 					lookbehindLength = 0,
 					alias = pattern.alias;

+				if (greedy && !pattern.pattern.global) {
+					// Without the global flag, lastIndex won't work
+					var flags = pattern.pattern.toString().match(/[imuy]*$/)[0];
+					pattern.pattern = RegExp(pattern.pattern.source, flags + "g");
+				}
+
 				pattern = pattern.pattern || pattern;

-				for (var i=0; i<strarr.length; i++) { // Don’t cache length as it changes during the loop
+				// Don’t cache length as it changes during the loop
+				for (var i=0, pos = 0; i<strarr.length; pos += strarr[i].length, ++i) {

 					var str = strarr[i];

@@ -1921,40 +1933,38 @@ var _ = _self.Prism = {

 					// Greedy patterns can override/remove up to two previously matched tokens
 					if (!match && greedy && i != strarr.length - 1) {
-						// Reconstruct the original text using the next two tokens
-						var nextToken = strarr[i + 1].matchedStr || strarr[i + 1],
-						    combStr = str + nextToken;
-
-						if (i < strarr.length - 2) {
-							combStr += strarr[i + 2].matchedStr || strarr[i + 2];
-						}
-
-						// Try the pattern again on the reconstructed text
-						pattern.lastIndex = 0;
-						match = pattern.exec(combStr);
+						pattern.lastIndex = pos;
+						match = pattern.exec(text);
 						if (!match) {
-							continue;
+							break;
 						}

-						var from = match.index + (lookbehind ? match[1].length : 0);
-						// To be a valid candidate, the new match has to start inside of str
-						if (from >= str.length) {
+						var from = match.index + (lookbehind ? match[1].length : 0),
+						    to = match.index + match[0].length,
+						    k = i,
+						    p = pos;
+
+						for (var len = strarr.length; k < len && p < to; ++k) {
+							p += strarr[k].length;
+							// Move the index i to the element in strarr that is closest to from
+							if (from >= p) {
+								++i;
+								pos = p;
+							}
+						}
+
+						/*
+						 * If strarr[i] is a Token, then the match starts inside another Token, which is invalid
+						 * If strarr[k - 1] is greedy we are in conflict with another greedy pattern
+						 */
+						if (strarr[i] instanceof Token || strarr[k - 1].greedy) {
 							continue;
 						}
-						var to = match.index + match[0].length,
-						    len = str.length + nextToken.length;

 						// Number of tokens to delete and replace with the new match
-						delNum = 3;
-
-						if (to <= len) {
-							if (strarr[i + 1].greedy) {
-								continue;
-							}
-							delNum = 2;
-							combStr = combStr.slice(0, len);
-						}
-						str = combStr;
+						delNum = k - i;
+						str = text.slice(pos, p);
+						match.index -= pos;
 					}

 					if (!match) {
@@ -2023,7 +2033,7 @@ var Token = _.Token = function(type, content, alias, matchedStr, greedy) {
 	this.content = content;
 	this.alias = alias;
 	// Copy of the full string this token was created from
-	this.matchedStr = matchedStr || null;
+	this.length = (matchedStr || "").length|0;
 	this.greedy = !!greedy;
 };

@@ -2059,13 +2069,11 @@ Token.stringify = function(o, language, parent) {

 	_.hooks.run('wrap', env);

-	var attributes = '';
+	var attributes = Object.keys(env.attributes).map(function(name) {
+		return name + '="' + (env.attributes[name] || '').replace(/"/g, '&quot;') + '"';
+	}).join(' ');

-	for (var name in env.attributes) {
-		attributes += (attributes ? ' ' : '') + name + '="' + (env.attributes[name] || '') + '"';
-	}
-
-	return '<' + env.tag + ' class="' + env.classes.join(' ') + '" ' + attributes + '>' + env.content + '</' + env.tag + '>';
+	return '<' + env.tag + ' class="' + env.classes.join(' ') + '"' + (attributes ? ' ' + attributes : '') + '>' + env.content + '</' + env.tag + '>';

 };

@@ -2098,7 +2106,11 @@ if (script) {

 	if (document.addEventListener && !script.hasAttribute('data-manual')) {
 		if(document.readyState !== "loading") {
-			requestAnimationFrame(_.highlightAll, 0);
+			if (window.requestAnimationFrame) {
+				window.requestAnimationFrame(_.highlightAll);
+			} else {
+				window.setTimeout(_.highlightAll, 16);
+			}
 		}
 		else {
 			document.addEventListener('DOMContentLoaded', _.highlightAll);
@@ -2110,7 +2122,7 @@ return _self.Prism;

 })();

-if (typeof module !== 'undefined' && module.exports) {
+if ('object' !== 'undefined' && module.exports) {
 	module.exports = Prism;
 }

@@ -2127,10 +2139,10 @@ if (typeof commonjsGlobal !== 'undefined') {
 Prism.languages.markup = {
 	'comment': /<!--[\w\W]*?-->/,
 	'prolog': /<\?[\w\W]+?\?>/,
-	'doctype': /<!DOCTYPE[\w\W]+?>/,
+	'doctype': /<!DOCTYPE[\w\W]+?>/i,
 	'cdata': /<!\[CDATA\[[\w\W]*?]]>/i,
 	'tag': {
-		pattern: /<\/?(?!\d)[^\s>\/=.$<]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,
+		pattern: /<\/?(?!\d)[^\s>\/=$<]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,
 		inside: {
 			'tag': {
 				pattern: /^<\/?[^\s>\/]+/i,
@@ -2187,7 +2199,10 @@ Prism.languages.css = {
 	},
 	'url': /url\((?:(["'])(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1|.*?)\)/i,
 	'selector': /[^\{\}\s][^\{\};]*?(?=\s*\{)/,
-	'string': /("|')(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1/,
+	'string': {
+		pattern: /("|')(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1/,
+		greedy: true
+	},
 	'property': /(\b|\B)[\w-]+(?=\s*:)/i,
 	'important': /\B!important\b/i,
 	'function': /[-a-z0-9]+(?=\()/i,
@@ -2268,7 +2283,8 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 	'keyword': /\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\b/,
 	'number': /\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,
 	// Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
-	'function': /[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i
+	'function': /[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i,
+	'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*\*?|\/|~|\^|%|\.{3}/
 });

 Prism.languages.insertBefore('javascript', 'keyword', {
@@ -2453,11 +2469,14 @@ function tree (toc, tpl) {
  return tpl
 }

+function helper (className, content) {
+  return ("<p class=\"" + className + "\">" + (content.slice(5).trim()) + "</p>")
+}
+
 var OPTIONS$1 = {};
 var markdown = marked;
 var toc = [];
 var CACHE = {};
-var TIP_RE = /^!\s/;

 var renderTo = function (dom, content) {
  dom = typeof dom === 'object' ? dom : document.querySelector(dom);
@@ -2495,10 +2514,9 @@ function init (options) {
  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);

-    return ("<pre data-lang=\"" + lang + "\"><code class=\"lang-" + lang + "\">" + hl + "</code></pre>")
+    return ("<pre v-pre data-lang=\"" + lang + "\"><code class=\"lang-" + lang + "\">" + (hl.replace(/:/g, '__colon__')) + "</code></pre>")
  };
  renderer.link = function (href, title, text) {
    if (OPTIONS$1.router && !/:/.test(href)) {
@@ -2508,8 +2526,12 @@ function init (options) {
    return ("<a href=\"" + href + "\" title=\"" + (title || '') + "\">" + text + "</a>")
  };
  renderer.paragraph = function (text) {
-    var isTip = TIP_RE.test(text);
-    return isTip ? ("<p class=\"tip\">" + (text.replace(TIP_RE, '')) + "</p>") : ("<p>" + text + "</p>")
+    if (/^!&gt;/.test(text)) {
+      return helper('tip', text)
+    } else if (/^\?&gt;/.test(text)) {
+      return helper('warn', text)
+    }
+    return ("<p>" + text + "</p>")
  };

  if (typeof OPTIONS$1.markdown === 'function') {
@@ -2518,6 +2540,10 @@ function init (options) {
  } else {
    markdown.setOptions(merge({ renderer: renderer }, OPTIONS$1.markdown));
  }
+
+  var md = markdown;
+
+  markdown = function (text) { return emojify(md(text)); };
 }

 /**
@@ -2550,9 +2576,15 @@ function renderArticle (content) {
  renderTo('article', content ? markdown(content) : 'not found');
  if (!OPTIONS$1.sidebar && !OPTIONS$1.loadSidebar) { renderSidebar(); }

-  if (content && typeof Vue !== 'undefined' && typeof Vuep !== 'undefined') {
-    var vm = new Vue({ el: 'main' }); // eslint-disable-line
-    vm.$nextTick(function (_) { return scrollActiveSidebar(); });
+  if (content && typeof Vue !== 'undefined') {
+    var script = content.match('<script[^>]*?>([^<]+)</script>');
+
+    script && document.body.querySelector('article script').remove();
+    CACHE.vm && CACHE.vm.$destroy();
+    CACHE.vm = script
+      ? new Function(("return " + (script[1].trim())))()
+      : new Vue({ el: 'main' }); // eslint-disable-line
+    CACHE.vm && CACHE.vm.$nextTick(function (_) { return scrollActiveSidebar(); });
  }
  if (OPTIONS$1.auto2top) { setTimeout(function () { return scroll2Top(OPTIONS$1.auto2top); }, 0); }
 }
@@ -2576,12 +2608,15 @@ function renderSidebar (content) {

  if (content) {
    html = markdown(content);
+    // find url tag
+    html = html.match(/<ul[^>]*>([\s\S]+)<\/ul>/g)[0];
  } else if (OPTIONS$1.sidebar) {
    html = tree(OPTIONS$1.sidebar, '<ul>');
  } else {
    html = tree(genTree(toc, OPTIONS$1.maxLevel), '<ul>');
  }

+  html = (OPTIONS$1.name ? ("<h1><a href=\"" + (OPTIONS$1.nameLink) + "\">" + (OPTIONS$1.name) + "</a></h1>") : '') + html;
  renderTo('aside.sidebar', html);
  var target = activeLink('aside.sidebar', true);
  if (target) { renderSubSidebar(target); }
@@ -2605,18 +2640,21 @@ function renderCover (content) {
    return
  }
  renderCover.dom.classList.add('show');
-  if (renderCover.rendered) { return }
+  if (renderCover.rendered) { return sticky() }

  // render cover
+  var cacheToc = toc.slice();
  var html = markdown(content);
-  var match = html.trim().match('<p><img[^s]+src="(.*?)"[^a]+alt="(.*?)"></p>$');
+  var match = html.trim().match('<p><img[^s]+src="(.*?)"[^a]+alt="(.*?)">([^<]*?)</p>$');
+
+  toc = cacheToc.slice();

  // render background
  if (match) {
    var coverEl = document.querySelector('section.cover');

    if (match[2] === 'color') {
-      coverEl.style.background = match[1];
+      coverEl.style.background = match[1] + (match[3] || '');
    } else {
      coverEl.classList.add('has-mask');
      coverEl.style.backgroundImage = "url(" + (match[1]) + ")";
@@ -2680,7 +2718,9 @@ var OPTIONS = merge({
  homepage: 'README.md',
  coverpage: '',
  basePath: '',
-  auto2top: false
+  auto2top: false,
+  name: '',
+  nameLink: window.location.pathname
 }, window.$docsify);
 var script = document.currentScript || [].slice.call(document.getElementsByTagName('script')).pop();

@@ -2693,6 +2733,8 @@ if (script) {
  if (OPTIONS.loadSidebar === true) { OPTIONS.loadSidebar = '_sidebar.md'; }
  if (OPTIONS.loadNavbar === true) { OPTIONS.loadNavbar = '_navbar.md'; }
  if (OPTIONS.coverpage === true) { OPTIONS.coverpage = '_coverpage.md'; }
+  if (OPTIONS.repo === true) { OPTIONS.repo = ''; }
+  if (OPTIONS.name === true) { OPTIONS.name = ''; }
  if (OPTIONS.sidebar) { OPTIONS.sidebar = window[OPTIONS.sidebar]; }
 }

@@ -2737,11 +2779,10 @@ var mainRender = function (cb) {
    if (OPTIONS.coverpage && page !== OPTIONS.homepage) { renderCover(); }
    // render sidebar
    if (OPTIONS.loadSidebar) {
-      load(basePath + OPTIONS.loadSidebar)
-        .then(function (result) {
-          renderSidebar(result);
-          cb();
-        });
+      var renderSidebar$$1 = function (result) { renderSidebar(result); cb(); };
+
+      load(basePath + OPTIONS.loadSidebar).then(renderSidebar$$1,
+        function (_) { return load(OPTIONS.loadSidebar).then(renderSidebar$$1); });
    } else {
      cb();
    }
@@ -2749,7 +2790,8 @@ var mainRender = function (cb) {

  // Render navbar
  if (OPTIONS.loadNavbar) {
-    load(basePath + OPTIONS.loadNavbar).then(renderNavbar);
+    load(basePath + OPTIONS.loadNavbar).then(renderNavbar,
+      function (_) { return load(OPTIONS.loadNavbar).then(renderNavbar); });
  }
 };

@@ -1,6 +1,6 @@
 {
  "name": "docsify",
-  "version": "1.6.1",
+  "version": "1.10.1",
  "description": "A magical documentation generator.",
  "main": "lib/docsify.js",
  "files": [
@@ -35,9 +35,9 @@
    "nodemon": "^1.11.0",
    "postcss": "^5.2.6",
    "postcss-salad": "^1.0.5",
-    "rollup": "^0.36.3",
-    "rollup-plugin-buble": "^0.14.0",
-    "rollup-plugin-commonjs": "^5.0.5",
+    "rollup": "^0.41.1",
+    "rollup-plugin-buble": "^0.15.0",
+    "rollup-plugin-commonjs": "^7.0.0",
    "rollup-plugin-node-resolve": "^2.0.0",
    "rollup-plugin-uglify": "^1.0.1",
    "serve-static": "^1.11.1"
@@ -48,7 +48,7 @@ export function scrollActiveSidebar () {

    li.classList.add('active')
    active = li
-    !hoveredOverSidebar && sticky.isSticky && active.scrollIntoView()
+    !hoveredOverSidebar && !sticky.noSticky && active.scrollIntoView(false)
  }

  window.removeEventListener('scroll', highlight)
@@ -107,9 +107,9 @@ export function bindToggle (dom) {

  if (isMobile()) {
    const sidebar = document.querySelector('aside.sidebar')
-    document.body.addEventListener('click', e => {
-      if (e.target !== dom && !dom.contains(e.target)) body.classList.toggle('close')
-      if (sidebar.contains(e.target)) setTimeout(() => activeLink(sidebar, true), 0)
+    sidebar.addEventListener('click', () => {
+      body.classList.toggle('close')
+      setTimeout(() => activeLink(sidebar, true), 0)
    })
  }
 }
@@ -119,16 +119,16 @@ export function scroll2Top (offset = 0) {
 }

 export function sticky () {
-  const dom = document.querySelector('section.cover')
-  const coverHeight = dom.getBoundingClientRect().height
+  sticky.dom = sticky.dom || document.querySelector('section.cover')
+  const coverHeight = sticky.dom.getBoundingClientRect().height

  return (function () {
-    if (window.pageYOffset >= coverHeight || dom.classList.contains('hidden')) {
+    if (window.pageYOffset >= coverHeight || sticky.dom.classList.contains('hidden')) {
      document.body.classList.add('sticky')
-      sticky.isSticky = true
+      sticky.noSticky = false
    } else {
      document.body.classList.remove('sticky')
-      sticky.isSticky = false
+      sticky.noSticky = true
    }
  })()
 }
@@ -15,7 +15,9 @@ const OPTIONS = merge({
  homepage: 'README.md',
  coverpage: '',
  basePath: '',
-  auto2top: false
+  auto2top: false,
+  name: '',
+  nameLink: window.location.pathname
 }, window.$docsify)
 const script = document.currentScript || [].slice.call(document.getElementsByTagName('script')).pop()

@@ -28,6 +30,8 @@ if (script) {
  if (OPTIONS.loadSidebar === true) OPTIONS.loadSidebar = '_sidebar.md'
  if (OPTIONS.loadNavbar === true) OPTIONS.loadNavbar = '_navbar.md'
  if (OPTIONS.coverpage === true) OPTIONS.coverpage = '_coverpage.md'
+  if (OPTIONS.repo === true) OPTIONS.repo = ''
+  if (OPTIONS.name === true) OPTIONS.name = ''
  if (OPTIONS.sidebar) OPTIONS.sidebar = window[OPTIONS.sidebar]
 }

@@ -72,11 +76,10 @@ const mainRender = function (cb) {
    if (OPTIONS.coverpage && page !== OPTIONS.homepage) render.renderCover()
    // render sidebar
    if (OPTIONS.loadSidebar) {
-      load(basePath + OPTIONS.loadSidebar)
-        .then(result => {
-          render.renderSidebar(result)
-          cb()
-        })
+      const renderSidebar = result => { render.renderSidebar(result); cb() }
+
+      load(basePath + OPTIONS.loadSidebar).then(renderSidebar,
+        _ => load(OPTIONS.loadSidebar).then(renderSidebar))
    } else {
      cb()
    }
@@ -84,7 +87,8 @@ const mainRender = function (cb) {

  // Render navbar
  if (OPTIONS.loadNavbar) {
-    load(basePath + OPTIONS.loadNavbar).then(render.renderNavbar)
+    load(basePath + OPTIONS.loadNavbar).then(render.renderNavbar,
+      _ => load(OPTIONS.loadNavbar).then(render.renderNavbar))
  }
 }

@@ -2,13 +2,12 @@ import marked from 'marked'
 import Prism from 'prismjs'
 import * as tpl from './tpl'
 import * as event from './event'
-import { genTree, getRoute, isMobile, slugify, merge } from './util'
+import { genTree, getRoute, isMobile, slugify, merge, emojify } from './util'

 let OPTIONS = {}
 let markdown = marked
 let toc = []
 const CACHE = {}
-const TIP_RE = /^!\s/

 const renderTo = function (dom, content) {
  dom = typeof dom === 'object' ? dom : document.querySelector(dom)
@@ -45,9 +44,8 @@ export function init (options) {
  // highlight code
  renderer.code = function (code, lang = '') {
    const 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>`
+    return `<pre v-pre data-lang="${lang}"><code class="lang-${lang}">${hl.replace(/:/g, '__colon__')}</code></pre>`
  }
  renderer.link = function (href, title, text) {
    if (OPTIONS.router && !/:/.test(href)) {
@@ -57,8 +55,12 @@ export function init (options) {
    return `<a href="${href}" title="${title || ''}">${text}</a>`
  }
  renderer.paragraph = function (text) {
-    const isTip = TIP_RE.test(text)
-    return isTip ? `<p class="tip">${text.replace(TIP_RE, '')}</p>` : `<p>${text}</p>`
+    if (/^!&gt;/.test(text)) {
+      return tpl.helper('tip', text)
+    } else if (/^\?&gt;/.test(text)) {
+      return tpl.helper('warn', text)
+    }
+    return `<p>${text}</p>`
  }

  if (typeof OPTIONS.markdown === 'function') {
@@ -67,6 +69,10 @@ export function init (options) {
  } else {
    markdown.setOptions(merge({ renderer }, OPTIONS.markdown))
  }
+
+  const md = markdown
+
+  markdown = text => emojify(md(text))
 }

 /**
@@ -99,9 +105,15 @@ export function renderArticle (content) {
  renderTo('article', content ? markdown(content) : 'not found')
  if (!OPTIONS.sidebar && !OPTIONS.loadSidebar) renderSidebar()

-  if (content && typeof Vue !== 'undefined' && typeof Vuep !== 'undefined') {
-    const vm = new Vue({ el: 'main' }) // eslint-disable-line
-    vm.$nextTick(_ => event.scrollActiveSidebar())
+  if (content && typeof Vue !== 'undefined') {
+    const script = content.match('<script[^>]*?>([^<]+)</script>')
+
+    script && document.body.querySelector('article script').remove()
+    CACHE.vm && CACHE.vm.$destroy()
+    CACHE.vm = script
+      ? new Function(`return ${script[1].trim()}`)()
+      : new Vue({ el: 'main' }) // eslint-disable-line
+    CACHE.vm && CACHE.vm.$nextTick(_ => event.scrollActiveSidebar())
  }
  if (OPTIONS.auto2top) setTimeout(() => event.scroll2Top(OPTIONS.auto2top), 0)
 }
@@ -125,12 +137,15 @@ export function renderSidebar (content) {

  if (content) {
    html = markdown(content)
+    // find url tag
+    html = html.match(/<ul[^>]*>([\s\S]+)<\/ul>/g)[0]
  } else if (OPTIONS.sidebar) {
    html = tpl.tree(OPTIONS.sidebar, '<ul>')
  } else {
    html = tpl.tree(genTree(toc, OPTIONS.maxLevel), '<ul>')
  }

+  html = (OPTIONS.name ? `<h1><a href="${OPTIONS.nameLink}">${OPTIONS.name}</a></h1>` : '') + html
  renderTo('aside.sidebar', html)
  const target = event.activeLink('aside.sidebar', true)
  if (target) renderSubSidebar(target)
@@ -154,18 +169,21 @@ export function renderCover (content) {
    return
  }
  renderCover.dom.classList.add('show')
-  if (renderCover.rendered) return
+  if (renderCover.rendered) return event.sticky()

  // render cover
+  const cacheToc = toc.slice()
  let html = markdown(content)
-  const match = html.trim().match('<p><img[^s]+src="(.*?)"[^a]+alt="(.*?)"></p>$')
+  const match = html.trim().match('<p><img[^s]+src="(.*?)"[^a]+alt="(.*?)">([^<]*?)</p>$')
+
+  toc = cacheToc.slice()

  // render background
  if (match) {
    const coverEl = document.querySelector('section.cover')

    if (match[2] === 'color') {
-      coverEl.style.background = match[1]
+      coverEl.style.background = match[1] + (match[3] || '')
    } else {
      coverEl.classList.add('has-mask')
      coverEl.style.backgroundImage = `url(${match[1]})`
@@ -7,6 +7,11 @@
  -webkit-font-smoothing: antialiased;
 }

+.emoji {
+  height: 1.2em;
+  vertical-align: middle;
+}
+
 .progress {
  background-color: $color-primary;
  height: 2px;
@@ -96,6 +101,7 @@ nav {
    display: inline-block;

    ul {
+      border-radius: 2px;
      background-color: rgba($color-bg, .6);
      border: 1px solid $color-primary;
      opacity: 0;
@@ -160,6 +166,7 @@ nav {

 /* main */
 main {
+  display: block;
  size: 100vw 100%;
  position: relative;
 }
@@ -180,13 +187,34 @@ main {

 /* sidebar */
 .sidebar {
-  border-right: 1px solid rgba(0, 0, 0, .07);
  overflow-y: auto;
  padding: 40px 0;
  position: absolute 0 * 0 0;
  transition: transform 250ms ease-out;
  width: $sidebar-width;
  z-index: 20;
+  margin-bottom: 40px;
+
+  &::after {
+    content: '';
+    position: inherit;
+    left: calc($sidebar-width - 1px);
+    top: 0;
+    height: 100vh;
+    border-right: 1px solid rgba(0, 0, 0, .07);
+  }
+
+  > h1 {
+    text-align: center;
+    margin: 0 auto 1em;
+    font-size: 1.5em;
+    font-weight: 300;
+
+    a {
+      color: inherit;
+      text-decoration: none;
+    }
+  }

  ul {
    margin: 0;
@@ -264,6 +292,12 @@ body.sticky {
  }
 }

+.markdown-section hr {
+  border: none;
+  margin: 2em 0;
+  border-bottom: 1px solid #eee;
+}
+
 .markdown-section table {
  display: block;
  width: 100%;
@@ -325,6 +359,12 @@ body.sticky {
  }
 }

+.markdown-section p.warn {
+  padding: 1em;
+  background: rgba($color-primary, 0.1);
+  border-radius: 2px;
+}
+
 body.close {
  .sidebar {
    transform: translateX(-$sidebar-width);
@@ -344,6 +384,15 @@ body.close {
    position: fixed;
  }

+  .sidebar {
+    margin-bottom: 0;
+    border-right: 1px solid rgba(0, 0, 0, .07);
+
+    &::after {
+      content: none;
+    }
+  }
+
  nav {
    margin-top: 16px;
  }
@@ -28,7 +28,7 @@ $sidebar-width: 16em;
    padding: 0;
  }

-  .active {
+  li.active {
    background-color: #eee;

    a {
@@ -72,3 +72,6 @@ export function tree (toc, tpl = '') {
  return tpl
 }

+export function helper (className, content) {
+  return `<p class="${className}">${content.slice(5).trim()}</p>`
+}
@@ -157,3 +157,10 @@ export const merge = Object.assign || function (to) {

  return to
 }
+
+export function emojify (text) {
+  return text
+    .replace(/:(\S*?):/ig, '<img class="emoji" src="https://assets-cdn.github.com/images/icons/emoji/$1.png" alt="$1" />')
+    .replace(/__colon__/g, ':')
+}
+
Author	SHA1	Message	Date
qingwei.li	c9739e71af	-> v1.10.1	2017-01-25 21:17:54 +08:00
qingwei.li	bda1b76ba5	bump 1.10.1	2017-01-25 21:17:43 +08:00
qingwei.li	11f77cd434	Fix render emojis	2017-01-25 21:16:53 +08:00
qingwei.li	6d42c6b04a	-> v1.10.0	2017-01-25 15:08:40 +08:00
qingwei.li	46967e73bf	bump 1.10.0	2017-01-25 15:08:28 +08:00
qingwei.li	ccdc3c855a	Support emoji, closed #61	2017-01-25 15:07:36 +08:00
qingwei.li	7c4b0b7c74	-> v1.9.0	2017-01-24 22:31:44 +08:00
qingwei.li	98d1b19bea	bump 1.9.0	2017-01-24 22:31:27 +08:00
cinwell.liandGitHub	0709239c77	1.9 (#62 ) * Destroys the vue instance when the route is changed * Add new doc helper * Update docs	2017-01-24 22:29:50 +08:00
qingwei.li	73cc43c6bd	-> v1.8.0	2017-01-24 11:28:15 +08:00
qingwei.li	9d096b03a4	bump 1.8.0	2017-01-24 11:28:04 +08:00
qingwei.li	2af035ff45	Fix fallback sidebar	2017-01-24 10:18:58 +08:00
qingwei.li	3979f5cd3f	Update change log	2017-01-24 10:07:14 +08:00
qingwei.li	9abae495ac	Execute script when vue exists.	2017-01-24 10:06:38 +08:00
qingwei.li	d179ade7df	Using v-pre	2017-01-18 16:35:19 +08:00
qingwei.li	d79c7655cd	Update license	2017-01-18 16:34:05 +08:00
citycideandcinwell.li	af5d2934e4	add `Trilogy` to showcase list (#58 )	2017-01-17 08:05:12 +08:00
Antony Jonesandcinwell.li	129bd4d3a0	Add vudash to list of projects using docsify (#57 )	2017-01-15 18:45:32 +08:00
qingwei.li	abaf5c0849	-> v1.7.4	2017-01-13 23:33:20 +08:00
qingwei.li	336efb30cb	bump 1.7.4	2017-01-13 23:33:04 +08:00
qingwei.li	fb8bf89d73	Fix bugs caused by the previous version, fixed #56	2017-01-13 23:32:38 +08:00
qingwei.li	8630591bd2	-> v1.7.3	2017-01-13 23:06:31 +08:00
qingwei.li	c47ff83073	bump 1.7.3	2017-01-13 23:06:18 +08:00
cinwell.liandGitHub	69e500bd33	Fix repo (#55 ) * Fix option is an empty string * Fix test * Add hr style #54 * Tweak hr style	2017-01-13 23:05:05 +08:00
qingwei.li	000a1fcdf0	-> v1.7.2	2017-01-12 21:31:40 +08:00
qingwei.li	b84544960f	bump 1.7.2	2017-01-12 21:31:22 +08:00
qingwei.li	28a004840d	Fix sidebar click event in mobile browser	2017-01-12 21:30:33 +08:00
qingwei.li	ff44152d12	-> v1.7.1	2017-01-12 20:46:24 +08:00
qingwei.li	b6bfad8579	bump 1.7.1	2017-01-12 20:46:04 +08:00
qingwei.li	e93f6b95ea	Fix sidebar style in mobile browser	2017-01-12 20:45:35 +08:00
qingwei.li	5c58629e69	Fix index.html	2017-01-12 20:34:47 +08:00
qingwei.li	55826691eb	-> v1.7.0	2017-01-12 20:30:13 +08:00
qingwei.li	64093c0567	bump 1.7.0	2017-01-12 20:29:45 +08:00
qingwei.li	c998fad98e	Add docs	2017-01-12 20:28:59 +08:00
qingwei.li	0a2e1ddf11	Tweak active item in sidebar	2017-01-12 20:23:55 +08:00
qingwei.li	4a7df99224	Add name link	2017-01-12 20:16:18 +08:00
qingwei.li	6c6f687925	Merge branch 'feat/data-name'	2017-01-12 19:48:21 +08:00
qingwei.li	ddc13aa280	Add changelog	2017-01-12 19:46:59 +08:00
qingwei.li	f997280ab1	Fix sticky sidebar	2017-01-12 19:46:28 +08:00
qingwei.li	458e262a26	Tweak style	2017-01-12 18:44:41 +08:00
qingwei.li	d971948f10	Add yarn.lock	2017-01-12 18:44:41 +08:00
qingwei.li	a309d3041e	Update docs	2017-01-12 18:44:41 +08:00
qingwei.li	557a165349	fixed custom cover background, fixed #52	2017-01-12 18:44:41 +08:00
Chao Leeandcinwell.li	d9eedf609e	add showcase at README.md (#53 )	2017-01-12 11:32:45 +08:00
qingwei.li	aa939147c6	Add name option	2017-01-11 18:11:49 +08:00
qingwei.li	67c1d0cd7d	Add yarn.lock	2017-01-11 16:53:08 +08:00
qingwei.li	06892e6de4	Update docs	2017-01-11 16:22:17 +08:00
qingwei.li	439a1e6841	fixed custom cover background, fixed #52	2017-01-11 16:18:43 +08:00
qingwei.li	f540e3c4fc	Add bash/markdown highlight	2017-01-10 23:55:58 +08:00
qingwei.li	2ffef062db	Update version number	2017-01-10 23:52:32 +08:00