From 9092b2224620fde4193660e96bd04467bd628fc6 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Tue, 13 Dec 2016 22:26:56 +0800 Subject: [PATCH 1/3] Fix cache sidebar content --- 404.dev.html | 2 +- CHANGELOG.md | 4 ++++ src/render.js | 9 ++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/404.dev.html b/404.dev.html index 18257df03..b8c6e05d6 100644 --- a/404.dev.html +++ b/404.dev.html @@ -8,5 +8,5 @@
- + diff --git a/CHANGELOG.md b/CHANGELOG.md index ca7f2ebf6..440325aa8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.3 +### Bug fixes +- Fix cache + ## 1.0.2 ### Bug fixes - Fix binding events bug, fixed #24 diff --git a/src/render.js b/src/render.js index 5c9b1d252..3688db345 100644 --- a/src/render.js +++ b/src/render.js @@ -75,7 +75,7 @@ export function renderArticle (content) { * navbar */ export function renderNavbar (content) { - if (CACHE['navbar'] === content) return + if (CACHE['navbar'] && CACHE['navbar'] === content) return CACHE['navbar'] = content renderNavbar.rendered = true @@ -87,10 +87,6 @@ export function renderNavbar (content) { * sidebar */ export function renderSidebar (content) { - if (CACHE['sidebar'] === content) return - CACHE['sidebar'] = content - renderSidebar.rendered = true - let isToc = false if (content) { @@ -102,6 +98,9 @@ export function renderSidebar (content) { isToc = true } + renderSidebar.rendered = true + if (CACHE['sidebar'] && CACHE['sidebar'] === content) return + CACHE['sidebar'] = content renderTo('aside.sidebar', content) if (isToc) scrollActiveSidebar() toc = [] From 844ba3e022b8d596402671fb71db979c1fc6dbb9 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Tue, 13 Dec 2016 22:27:26 +0800 Subject: [PATCH 2/3] bump 1.0.3 --- lib/docsify.js | 9 ++++----- lib/docsify.min.js | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/docsify.js b/lib/docsify.js index f842df940..415fb8b0d 100644 --- a/lib/docsify.js +++ b/lib/docsify.js @@ -2405,7 +2405,7 @@ function renderArticle (content) { * navbar */ function renderNavbar (content) { - if (CACHE['navbar'] === content) { return } + if (CACHE['navbar'] && CACHE['navbar'] === content) { return } CACHE['navbar'] = content; renderNavbar.rendered = true; @@ -2417,10 +2417,6 @@ function renderNavbar (content) { * sidebar */ function renderSidebar (content) { - if (CACHE['sidebar'] === content) { return } - CACHE['sidebar'] = content; - renderSidebar.rendered = true; - var isToc = false; if (content) { @@ -2432,6 +2428,9 @@ function renderSidebar (content) { isToc = true; } + renderSidebar.rendered = true; + if (CACHE['sidebar'] && CACHE['sidebar'] === content) { return } + CACHE['sidebar'] = content; renderTo('aside.sidebar', content); if (isToc) { scrollActiveSidebar(); } toc = []; diff --git a/lib/docsify.min.js b/lib/docsify.min.js index 161c16004..441baac12 100644 --- a/lib/docsify.min.js +++ b/lib/docsify.min.js @@ -1,2 +1,2 @@ -var Docsify=function(){"use strict";function e(e,t){void 0===t&&(t="get");var n=new XMLHttpRequest;return n.open(t,e),n.send(),{then:function(e,t){void 0===t&&(t=function(){}),n.addEventListener("error",t),n.addEventListener("load",function(n){var r=n.target;r.status>=400?t(r):e(r.response)})}}}function t(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 n(e){return e.replace(/([A-Z])/g,function(e){return"-"+e.toLowerCase()})}function r(e){return null===e||void 0===e}function i(){var e=window.location;if(v===e.hash&&!r(k))return k;var t=e.hash.match(/^#\/([^#]+)/);return t=t&&2===t.length?t[1]:/^#\//.test(e.hash)?"":e.pathname,k=t,v=e.hash,t}function a(){function e(){for(var e=0,r=t.length;e10){var o=n[a.id];if(!o||o===i)return;return i&&i.setAttribute("class",""),o.setAttribute("class","active"),void(i=o)}}}if(!/mobile/i.test(navigator.userAgent)){for(var t=document.querySelectorAll(".anchor"),n={},r=document.querySelectorAll(".sidebar li"),i=null,a=0,s=r.length;a\n \n '):""}function p(){return'
\n \n
\n
\n
\n
'}function g(e){return e?'':""}function h(e,t){return void 0===t&&(t=""),e&&e.length?(e.forEach(function(e){t+='
  • '+e.title+"
    • ",e.children&&(t+='
    • '+h(e.children)+"
    ")}),t):""}function d(e,t){var n=document.querySelector("nav")||document.createElement("nav");e[t?"outerHTML":"innerHTML"]=g(_.sidebarToggle)+c(_.repo)+p(),document.body.insertBefore(n,document.body.children[0]),l("button.sidebar-toggle")}function f(e){C("article",e?w(e):"not found"),b.rendered||b(null,_),m.rendered||m(null,_),b.rendered=!1,m.rendered=!1}function m(e){L.navbar!==e&&(L.navbar=e,m.rendered=!0,e&&C("nav",w(e)),o("nav"))}function b(e){if(L.sidebar!==e){L.sidebar=e,b.rendered=!0;var n=!1;e?e=w(e):_.sidebar?e=h(_.sidebar,"