From b0da9f23d3ba61799350fb73089fd3164a9f4967 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Sat, 11 Mar 2017 18:16:34 +0800 Subject: [PATCH 1/5] docs(vue): fix typo --- docs/vue.md | 2 +- docs/zh-cn/vue.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/vue.md b/docs/vue.md index 4eaa1feae..b2d4d3272 100644 --- a/docs/vue.md +++ b/docs/vue.md @@ -77,7 +77,7 @@ You can manually initialize a Vue instance. - diff --git a/docs/zh-cn/vue.md b/docs/zh-cn/vue.md index 88213de02..e0ecc5958 100644 --- a/docs/zh-cn/vue.md +++ b/docs/zh-cn/vue.md @@ -58,9 +58,18 @@ *index.html* ```html + + + + + + + + + ``` *README.md* @@ -84,4 +93,20 @@ ``` + + + + + ?> 具体效果参考 [Vuep 文档](https://qingwei-li.github.io/vuep/)。 From 3aef37a445a0b68bf1bd525f0e8d10f63d08b562 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Sat, 11 Mar 2017 19:30:38 +0800 Subject: [PATCH 3/5] feat(emojify): add no-emoji option --- docs/configuration.md | 10 ++++++++++ docs/zh-cn/configuration.md | 10 ++++++++++ src/core/config.js | 1 + src/core/render/emojify.js | 2 +- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/configuration.md b/docs/configuration.md index f5880f0ae..8aa1c41e9 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -295,3 +295,13 @@ window.$docsify = { ``` Note that if you are running an external script, e.g. an embedded jsfiddle demo, make sure to include the [external-script](plugins?id=external-script) plugin. + +## no-emoji + +Disabled emoji parse. + +```js +window.$docsify = { + noEmoji: true +} +``` diff --git a/docs/zh-cn/configuration.md b/docs/zh-cn/configuration.md index 103e88439..3ef44c056 100644 --- a/docs/zh-cn/configuration.md +++ b/docs/zh-cn/configuration.md @@ -305,3 +305,13 @@ window.$docsify = { ``` 注意如果执行的是一个外链脚本，比如 jsfiddle 的内嵌 demo，请确保引入 [external-script](zh-cn/plugins?id=外链脚本-external-script) 插件。 + +## no-emoji + +禁用 emoji 解析。 + +```js +window.$docsify = { + noEmoji: true +} +``` diff --git a/src/core/config.js b/src/core/config.js index 2cccfc503..705051967 100644 --- a/src/core/config.js +++ b/src/core/config.js @@ -16,6 +16,7 @@ const config = merge({ nameLink: window.location.pathname, autoHeader: false, executeScript: null, + noEmoji: false, ga: '' }, window.$docsify) diff --git a/src/core/render/emojify.js b/src/core/render/emojify.js index 8d7983c3e..b8d41aaff 100644 --- a/src/core/render/emojify.js +++ b/src/core/render/emojify.js @@ -3,7 +3,7 @@ function replace (m, $1) { } export function emojify (text) { - return text + return $docsify.noEmoji ? text : text .replace(/<(pre|template|code)[^>]*?>[\s\S]+?<\/(pre|template|code)>/g, m => m.replace(/:/g, '__colon__')) .replace(/:(\w+?):/ig, window.emojify || replace) .replace(/__colon__/g, ':') From 9b858fc4c40232126645a139c2997cab1d75bc42 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Sat, 11 Mar 2017 19:31:57 +0800 Subject: [PATCH 4/5] bump: 3.4.2 --- CHANGELOG.md | 4 ++++ lib/docsify.js | 3 ++- lib/docsify.min.js | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c83cf9096..7f42709b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ +# 3.4.2 / 2017-03-11 + +* feat(emojify): add no-emoji option + # 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) diff --git a/lib/docsify.js b/lib/docsify.js index 7ef9608d2..7b60b40fb 100644 --- a/lib/docsify.js +++ b/lib/docsify.js @@ -75,6 +75,7 @@ var config = merge({ nameLink: window.location.pathname, autoHeader: false, executeScript: null, + noEmoji: false, ga: '' }, window.$docsify); @@ -2938,7 +2939,7 @@ function replace (m, $1) { } function emojify (text) { - return text + return $docsify.noEmoji ? text : text .replace(/<(pre|template|code)[^>]*?>[\s\S]+?<\/(pre|template|code)>/g, function (m) { return m.replace(/:/g, '__colon__'); }) .replace(/:(\w+?):/ig, window.emojify || replace) .replace(/__colon__/g, ':') diff --git a/lib/docsify.min.js b/lib/docsify.min.js index 31c3618e4..02802b02e 100644 --- a/lib/docsify.min.js +++ b/lib/docsify.min.js @@ -1,2 +1,2 @@ -!function(){"use strict";function e(e){var t=Object.create(null);return function(n){var r=t[n];return r||(t[n]=e(n))}}function t(e){return"string"==typeof e||"number"==typeof e}function n(){}function r(e){return"function"==typeof e}function i(e){var t=["init","mounted","beforeEach","afterEach","doneEach","ready"];e._hooks={},e._lifecycle={},t.forEach(function(t){var n=e._hooks[t]=[];e._lifecycle[t]=function(e){return n.push(e)}})}function a(e,t,r,i){void 0===i&&(i=n);var a=r,o=e._hooks[t],s=function(e){var t=o[e];if(e>=o.length)i(a);else if("function"==typeof t)if(2===t.length)t(r,function(t){a=t,s(e+1)});else{var n=t(r);a=void 0!==n?n:a,s(e+1)}else s(e+1)};s(0)}function o(e,t){if(void 0===t&&(t=!1),"string"==typeof e){if("undefined"!=typeof window.Vue)return s(e);e=t?s(e):be[e]||(be[e]=s(e))}return e}function s(e,t){return t?e.querySelector(t):ye.querySelector(e)}function l(e,t){return[].slice.call(t?e.querySelectorAll(t):ye.querySelectorAll(e))}function u(e,t){return e=ye.createElement(e),t&&(e.innerHTML=t),e}function c(e,t){return e.appendChild(t)}function p(e,t){return e.insertBefore(t,e.children[0])}function h(e,t,n){r(t)?window.addEventListener(e,t):e.addEventListener(t,n)}function d(e,t,n){r(t)?window.removeEventListener(e,t):e.removeEventListener(t,n)}function g(e,t,n){e&&e.classList[n?t:"toggle"](n||t)}function f(e){var t={};return(e=e.trim().replace(/^(\?|#|&)/,""))?(e.split("&").forEach(function(e){var n=e.replace(/\+/g," ").split("=");t[n[0]]=Ce(n[1])}),t):t}function m(e){var t=[];for(var n in e)t.push((Ee(n)+"="+Ee(e[n])).toLowerCase());return t.length?"?"+t.join("&"):""}function v(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];return je(e.join("/"))}function b(e){var t=window.location.href.indexOf("#");window.location.replace(window.location.href.slice(0,t>=0?t:0)+"#"+e)}function y(){var e=k();return e=Oe(e),"/"===e.charAt(0)?b(e):void b("/"+e)}function k(){var e=window.location.href,t=e.indexOf("#");return t===-1?"":e.slice(t+1)}function w(e){void 0===e&&(e=window.location.href);var t="",n=e.indexOf("?");n>=0&&(t=e.slice(n+1),e=e.slice(0,n));var r=e.indexOf("#");return r&&(e=e.slice(r+1)),{path:e,query:f(t)}}function x(e,t){var n=w(Oe(e));return n.query=pe({},n.query,t),e=n.path+m(n.query),je("#/"+e)}function _(e){var t=function(){return ke.classList.toggle("close")};e=o(e),h(e,"click",t);var n=o(".sidebar");h(n,"click",function(){Se&&t(),setTimeout(function(){return S(n,!0,!0)},0)})}function L(){var e=o("section.cover");if(e){var t=e.getBoundingClientRect().height;window.pageYOffset>=t||e.classList.contains("hidden")?g(ke,"add","sticky"):g(ke,"remove","sticky")}}function S(e,t,n){e=o(e);var r,i=l(e,"a"),a="#"+k();return i.sort(function(e,t){return t.href.length-e.href.length}).forEach(function(e){var n=e.getAttribute("href"),i=t?e.parentNode:e;0!==a.indexOf(n)||r?g(i,"remove","active"):(r=e,g(i,"add","active"))}),n&&(ye.title=r?r.innerText+" - "+Pe:Pe),r}function C(){for(var e,t=o(".sidebar"),n=l(".anchor"),r=s(t,".sidebar-nav"),i=s(t,"li.active"),a=ke.scrollTop,u=0,c=n.length;ua){e||(e=p);break}e=p}if(e){var h=qe[e.getAttribute("data-id")];if(h&&h!==i&&(i&&i.classList.remove("active"),h.classList.add("active"),i=h,!Ne&&ke.classList.contains("sticky"))){var d=t.clientHeight,g=0,f=i.offsetTop+i.clientHeight+40,m=i.offsetTop>=r.scrollTop&&f<=r.scrollTop+d,v=f-g=400?a(n):(ze[e]=n.response,r(n.response))})},abort:function(e){return 4!==r.readyState&&r.abort()}})}function O(e,t){e.innerHTML=e.innerHTML.replace(/var\(\s*--theme-color.*?\)/g,t)}function M(e){return e?(/\/\//.test(e)||(e="https://github.com/"+e),e=e.replace(/^git\+/,""),''):""}function P(e){var t='';return(Se?t+"
":"
"+t)+'
'}function q(){var e=", 100%, 85%",t="linear-gradient(to left bottom, hsl("+(Math.floor(255*Math.random())+e)+") 0%,hsl("+(Math.floor(255*Math.random())+e)+") 100%)";return'
'}function N(e,t){return void 0===t&&(t=""),e&&e.length?(e.forEach(function(e){t+='
  • '+e.title+"
    • ",e.children&&(t+='
    • '+N(e.children)+"
    ")}),t):""}function F(e,t){return'

    '+t.slice(5).trim()+"

    "}function I(e){return""}function z(e,t){return t={exports:{}},e(t,t.exports),t.exports}function H(e,t){var n=[],r={};return e.forEach(function(e){var i=e.level||1,a=i-1;i>t||(r[a]?r[a].children=(r[a].children||[]).concat(e):n.push(e),r[i]=e)}),n}function R(e){if("string"!=typeof e)return"";var t=e.toLowerCase().trim().replace(/<[^>\d]+>/g,"").replace(Ue,"").replace(/\s/g,"-").replace(/-+/g,"-").replace(/^(\d)/,"_$1"),n=De[t];return n=De.hasOwnProperty(t)?n+1:0,De[t]=n,n&&(t=t+"-"+n),t}function W(e,t){return''+t+''}function B(e){return e.replace(/<(pre|template|code)[^>]*?>[\s\S]+?<\/(pre|template|code)>/g,function(e){return e.replace(/:/g,"__colon__")}).replace(/:(\w+?):/gi,window.emojify||W).replace(/__colon__/g,":")}function D(e,t){var n="";if(e)n=Qe(e),n=n.match(/]*>([\s\S]+)<\/ul>/g)[0];else{var r=Ye[Xe]||H(Je,t);n=N(r,"