fix(render): execute script

docsifyjs · Feb 20, 2017 · 780c1e5 · 780c1e5
1 parent 35dd2e1
commit 780c1e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/core/config.js b/src/core/config.js
@@ -15,7 +15,7 @@ const config = merge({
   themeColor: '',
   nameLink: window.location.pathname,
   autoHeader: false,
-  executeScript: false,
+  executeScript: null,
   ga: ''
 }, window.$docsify)
 

diff --git a/src/core/render/index.js b/src/core/render/index.js
@@ -28,9 +28,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()) {
@@ -39,6 +38,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) {