From d0861d74272fb6748f9daef0323fc0ad29df7377 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Fri, 23 Dec 2016 21:46:12 +0800 Subject: [PATCH] Fixed cover rendering timing --- CHANGELOG.md | 4 ++++ docs/_coverpage.md | 2 +- src/index.js | 12 +++++------- src/render.js | 2 ++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8be2e7..d9f6329 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.3.3 +### Bug fixes +- Fixed cover rendering timing + ## 1.3.2 ### Bug fixes diff --git a/docs/_coverpage.md b/docs/_coverpage.md index 08945c4..92ba592 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -1,6 +1,6 @@ ![logo](_media/icon.svg) -# docsify 1.3.2 +# docsify 1.3.3 > A magical documentation site generator. diff --git a/src/index.js b/src/index.js index 9d2ac9e..2ca7ead 100644 --- a/src/index.js +++ b/src/index.js @@ -59,12 +59,8 @@ const mainRender = function (cb) { } // Render Cover page - if (OPTIONS.coverpage) { - if (page === OPTIONS.homepage) { - load(OPTIONS.coverpage).then(render.renderCover) - } else { - render.renderCover() - } + if (OPTIONS.coverpage && page === OPTIONS.homepage) { + load(OPTIONS.coverpage).then(render.renderCover) } cacheXhr && cacheXhr.abort && cacheXhr.abort() @@ -72,6 +68,9 @@ const mainRender = function (cb) { cacheXhr = load(page, 'GET', render.renderLoading) cacheXhr.then(result => { render.renderArticle(result) + // clear cover + if (OPTIONS.coverpage && page !== OPTIONS.homepage) render.renderCover() + // render sidebar if (OPTIONS.loadSidebar) { if (wait === false) cb() wait = false @@ -102,7 +101,6 @@ const Docsify = function () { mainRender(_ => { activeLink('aside.sidebar', true) scrollIntoView() - OPTIONS.coverpage && sticky() }) } diff --git a/src/render.js b/src/render.js index 9872695..c021d07 100644 --- a/src/render.js +++ b/src/render.js @@ -132,6 +132,8 @@ export function renderCover (content) { !renderCover.rendered && renderTo('.cover-main', marked(content)) renderCover.rendered = true } + + sticky() } /**