From 3291b881f9c0fad609ef1d02141595153514ee51 Mon Sep 17 00:00:00 2001
From: L3au <leshu.lau@gmail.com>
Date: Mon, 27 May 2019 23:39:43 +0800
Subject: [PATCH 1/2] fix: document.currentScript reference
---
src/core/config.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/core/config.js b/src/core/config.js
index 9a3251e72..d95d4999b 100644
--- a/src/core/config.js
+++ b/src/core/config.js
@@ -1,5 +1,7 @@
import {merge, hyphenate, isPrimitive, hasOwn} from './util/core'
+const currentScript = document.currentScript
+
export default function () {
const config = merge(
{
@@ -36,7 +38,7 @@ export default function () {
)
const script =
- document.currentScript ||
+ currentScript ||
[].slice
.call(document.getElementsByTagName('script'))
.filter(n => /docsify\./.test(n.src))[0]
From 343b8ea1dbc450d2e0216bbc94507cd7e5454e2f Mon Sep 17 00:00:00 2001
From: L3au <leshu.lau@gmail.com>
Date: Tue, 28 May 2019 00:27:18 +0800
Subject: [PATCH 2/2] fix: merge config
---
src/core/config.js | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/core/config.js b/src/core/config.js
index d95d4999b..607bc1152 100644
--- a/src/core/config.js
+++ b/src/core/config.js
@@ -53,26 +53,22 @@ export default function () {
}
}
}
+ }
- if (config.loadSidebar === true) {
- config.loadSidebar = '_sidebar' + config.ext
- }
-
- if (config.loadNavbar === true) {
- config.loadNavbar = '_navbar' + config.ext
- }
-
- if (config.coverpage === true) {
- config.coverpage = '_coverpage' + config.ext
- }
-
- if (config.repo === true) {
- config.repo = ''
- }
-
- if (config.name === true) {
- config.name = ''
- }
+ if (config.loadSidebar === true) {
+ config.loadSidebar = '_sidebar' + config.ext
+ }
+ if (config.loadNavbar === true) {
+ config.loadNavbar = '_navbar' + config.ext
+ }
+ if (config.coverpage === true) {
+ config.coverpage = '_coverpage' + config.ext
+ }
+ if (config.repo === true) {
+ config.repo = ''
+ }
+ if (config.name === true) {
+ config.name = ''
}
window.$docsify = config