jyapayne/docsify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump 1.3.3

Browse source
This commit is contained in:
qingwei.li 2016-12-23 21:47:31 +08:00
commit 16623c9301
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/docsify.js
View file

@ -2506,6 +2506,8 @@ function renderCover (content) {
!renderCover.rendered && renderTo('.cover-main', marked(content)); !renderCover.rendered && renderTo('.cover-main', marked(content));
renderCover.rendered = true; renderCover.rendered = true;
} }
sticky();
} }
/** /**
@ -2610,12 +2612,8 @@ var mainRender = function (cb) {
} }
// Render Cover page // Render Cover page
if (OPTIONS.coverpage) { if (OPTIONS.coverpage && page === OPTIONS.homepage) {
if (page === OPTIONS.homepage) { load(OPTIONS.coverpage).then(renderCover);
load(OPTIONS.coverpage).then(renderCover);
} else {
renderCover();
}
} }
cacheXhr && cacheXhr.abort && cacheXhr.abort(); cacheXhr && cacheXhr.abort && cacheXhr.abort();
@ -2623,6 +2621,9 @@ var mainRender = function (cb) {
cacheXhr = load(page, 'GET', renderLoading); cacheXhr = load(page, 'GET', renderLoading);
cacheXhr.then(function (result) { cacheXhr.then(function (result) {
renderArticle(result); renderArticle(result);
// clear cover
if (OPTIONS.coverpage && page !== OPTIONS.homepage) { renderCover(); }
// render sidebar
if (OPTIONS.loadSidebar) { if (OPTIONS.loadSidebar) {
if (wait === false) { cb(); } if (wait === false) { cb(); }
wait = false; wait = false;
@ -2653,7 +2654,6 @@ var Docsify = function () {
mainRender(function (_) { mainRender(function (_) {
activeLink('aside.sidebar', true); activeLink('aside.sidebar', true);
scrollIntoView(); scrollIntoView();
OPTIONS.coverpage && sticky();
}); });
}; };

4
lib/docsify.min.js vendored
View file

File diff suppressed because one or more lines are too long