archive-gh-me/docsify
1
0
Fork 0
mirror of https://github.com/docsifyjs/docsify.git synced 2025-12-08 19:55:52 +00:00
Code Issues Projects Releases Wiki Activity

Fix vueGlobalOptions.data checks

Browse Source
This commit is contained in:
John Hildenbiddle 2020-10-10 01:45:02 -05:00
parent 35ad5c559b
commit cd8f2d3efc
1 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/core/render/index.js
View File

@ -67,7 +67,12 @@ function renderMain(html) {
.filter(elm => isMountedVue(elm));
// Store global data() return value as shared data object
if (!vueGlobalData && docsifyConfig.vueGlobalOptions.data) {
if (
!vueGlobalData &&
docsifyConfig.vueGlobalOptions &&
docsifyConfig.vueGlobalOptions.data &&
typeof docsifyConfig.vueGlobalOptions.data === 'function'
) {
vueGlobalData = docsifyConfig.vueGlobalOptions.data();
}
@ -98,38 +103,36 @@ function renderMain(html) {
if ('Vue' in window) {
const vueMountData = [];
if (docsifyConfig.vueOptions) {
vueMountData.push(
...Object.entries(docsifyConfig.vueOptions || {})
.map(([cssSelector, vueConfig]) => [
dom.find(markdownElm, cssSelector),
vueConfig,
])
.filter(([elm, vueConfig]) => elm)
);
}
// vueOptions
vueMountData.push(
...Object.entries(docsifyConfig.vueOptions || {})
.map(([cssSelector, vueConfig]) => [
dom.find(markdownElm, cssSelector),
vueConfig,
])
.filter(([elm, vueConfig]) => elm)
);
if (docsifyConfig.vueGlobalOptions) {
vueMountData.push(
...dom
.findAll('.markdown-section > *')
// Remove duplicates
.filter(elm => !vueMountData.some(([e, c]) => e === elm))
.map(elm => [
elm,
!docsifyConfig.vueGlobalOptions.data
? docsifyConfig.vueGlobalOptions
: // Replace data() return value with shared data object. This
// mimics the behavior of a global store when using the same
// configuration with multiple Vue instances.
Object.assign({}, docsifyConfig.vueGlobalOptions, {
data() {
return vueGlobalData;
},
}),
])
);
}
// vueGlobalOptions
vueMountData.push(
...dom
.findAll('.markdown-section > *')
// Remove duplicates
.filter(elm => !vueMountData.some(([e, c]) => e === elm))
.map(elm => [
elm,
!vueGlobalData
? {}
: // Replace data() return value with shared data object. This
// mimics the behavior of a global store when using the same
// configuration with multiple Vue instances.
Object.assign({}, docsifyConfig.vueGlobalOptions || {}, {
data() {
return vueGlobalData;
},
}),
])
);
for (const [mountElm, vueConfig] of vueMountData) {
const isValidTag = mountElm.tagName !== 'SCRIPT';