diff --git a/CHANGELOG.md b/CHANGELOG.md index cf63382f7..e445d16c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ +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 ================== diff --git a/lib/docsify.js b/lib/docsify.js index 3a17fd5c2..c75429e4b 100644 --- a/lib/docsify.js +++ b/lib/docsify.js @@ -74,7 +74,7 @@ var config = merge({ themeColor: '', nameLink: window.location.pathname, autoHeader: false, - executeScript: false, + executeScript: null, ga: '' }, window.$docsify); @@ -3106,9 +3106,8 @@ function renderMain (html) { this._renderTo('.markdown-section', html); // Render sidebar with the TOC !this.config.loadSidebar && this._renderSidebar(); - // execute script - this.config.executeScript && executeScript(); + // execute script if (this.config.executeScript !== false && typeof window.Vue !== 'undefined' && !executeScript()) { @@ -3117,6 +3116,8 @@ function renderMain (html) { vueVM && vueVM.$destroy && vueVM.$destroy(); window.__EXECUTE_RESULT__ = new window.Vue().$mount('#main'); }, 0); + } else { + this.config.executeScript && executeScript(); } if (this.config.auto2top) { @@ -3135,10 +3136,11 @@ function renderMixin (proto) { var maxLevel = ref.maxLevel; var subMaxLevel = ref.subMaxLevel; var autoHeader = ref.autoHeader; + var loadSidebar = ref.loadSidebar; this._renderTo('.sidebar-nav', sidebar(text, maxLevel)); var active = getAndActive('.sidebar-nav', true, true); - subSidebar(active, subMaxLevel); + loadSidebar && subSidebar(active, subMaxLevel); // bind event this.activeLink = active; scrollActiveSidebar(); diff --git a/lib/docsify.min.js b/lib/docsify.min.js index b61155af0..de46f3b65 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){return void 0===t&&(t=!1),"string"==typeof e&&(e=t?s(e):me[e]||s(e)),e}function s(e,t){return t?e.querySelector(t):ve.querySelector(e)}function l(e,t){return[].slice.call(t?e.querySelectorAll(t):ve.querySelectorAll(e))}function u(e,t){return e=ve.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 g(e,t,n){r(t)?window.removeEventListener(e,t):e.removeEventListener(t,n)}function d(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]]=Le(n[1])}),t):t}function m(e){var t=[];for(var n in e)t.push((Se(n)+"="+Se(e[n])).toLowerCase());return t.length?"?"+t.join("&"):""}function v(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];return Te(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=Ae(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(Ae(e));return n.query=ue({},n.query,t),e=n.path+m(n.query),Te("#/"+e)}function _(e){var t=function(){return be.classList.toggle("close")};if(e=o(e),h(e,"click",t),_e){var n=o(".sidebar");h(n,"click",function(){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")?d(be,"add","sticky"):d(be,"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?d(i,"remove","active"):(r=e,d(i,"add","active"))}),n&&(ve.title=r?r.innerText+" - "+Me:Me),r}function C(){for(var e,t=o(".sidebar"),n=l(".anchor"),r=s(t,".sidebar-nav"),i=s(t,"li.active"),a=be.scrollTop,u=0,c=n.length;ua){e||(e=p);break}e=p}if(e){var h=Oe[e.getAttribute("data-id")];if(h&&h!==i&&(i&&i.classList.remove("active"),h.classList.add("active"),i=h,!qe&&be.classList.contains("sticky"))){var g=t.clientHeight,d=0,f=i.offsetTop+i.clientHeight+40,m=i.offsetTop>=r.scrollTop&&f<=r.scrollTop+g,v=f-d=400?a(n):(Fe[e]=n.response,r(n.response))})},abort:function(e){return 4!==r.readyState&&r.abort()}})}function M(e,t){e.innerHTML=e.innerHTML.replace(/var\(\s*--theme-color.*?\)/g,t)}function O(e){return e?(/\/\//.test(e)||(e="https://github.com/"+e),e=e.replace(/^git\+/,""),'`'):""}function q(e){var t='';return(_e?t+"
":"
"+t)+'
'}function P(){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 H(e,t){return t={exports:{}},e(t,t.exports),t.exports}function z(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||[],r[a].children.push(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(De,"").replace(/\s/g,"-").replace(/-+/g,"-").replace(/^(\d)/,"_$1"),n=Be[t];return n=Be.hasOwnProperty(t)?n+1:0,Be[t]=n,n&&(t=t+"-"+n),t}function W(){Be={}}function B(e){return e.replace(/<(pre|template)[^>]*?>([\s\S]+)<\/(pre|template)>/g,function(e){return e.replace(/:/g,"__colon__")}).replace(/:(\w+?):/gi,'$1').replace(/__colon__/g,":")}function D(e,t){var n="";if(e)n=Je(e),n=n.match(/]*>([\s\S]+)<\/ul>/g)[0];else{var r=z(Ye,t);n=N(r,"