bump: 3.0.4
This commit is contained in:
parent
780c1e580e
commit
75686f1624
3 changed files with 13 additions and 5 deletions
|
|
@ -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
|
||||
==================
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
2
lib/docsify.min.js
vendored
2
lib/docsify.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue