Skip to content

Commit 52c20cf

Browse files
committed
fix: fix title inferrence regression (close #208)
1 parent c37bfb9 commit 52c20cf

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

lib/app/dataMixin.js

+11-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,17 @@ export default {
4747
return targetLang || defaultLang || {}
4848
},
4949
$title () {
50-
return this.$page.frontmatter.title || this.$localeConfig.title || this.$site.title || ''
50+
const page = this.$page
51+
const siteTitle = this.$localeConfig.title || this.$site.title || ''
52+
const selfTitle = page.frontmatter.home ? null : (
53+
page.frontmatter.title || // explicit title
54+
page.title // inferred title
55+
)
56+
return siteTitle
57+
? selfTitle
58+
? (siteTitle + ' | ' + selfTitle)
59+
: siteTitle
60+
: selfTitle || 'VuePress'
5161
},
5262
$description () {
5363
return this.$page.frontmatter.description || this.$localeConfig.description || this.$site.description || ''

lib/app/util.js

-12
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,3 @@ export function findPageForPath (pages, path) {
1414
}
1515
}
1616
}
17-
18-
export function getTitle (siteTitle, page) {
19-
const selfTitle = page.frontmatter.home ? null : (
20-
page.frontmatter.title || // explicit title
21-
page.title // inferred title
22-
)
23-
return siteTitle
24-
? selfTitle
25-
? (siteTitle + ' | ' + selfTitle)
26-
: siteTitle
27-
: selfTitle || 'VuePress'
28-
}

lib/default-theme/Layout.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import Home from './Home.vue'
2121
import Navbar from './Navbar.vue'
2222
import Page from './Page.vue'
2323
import Sidebar from './Sidebar.vue'
24-
import { pathToComponentName, getTitle, getLang } from '@app/util'
24+
import { pathToComponentName } from '@app/util'
2525
import { resolveSidebarItems } from './util'
2626
2727
export default {
@@ -76,7 +76,7 @@ export default {
7676
7777
created () {
7878
if (this.$ssrContext) {
79-
this.$ssrContext.title = getTitle(this.$title, this.$page)
79+
this.$ssrContext.title = this.$title
8080
this.$ssrContext.lang = this.$lang
8181
this.$ssrContext.description = this.$page.description || this.$description
8282
}
@@ -87,7 +87,7 @@ export default {
8787
// update title / meta tags
8888
this.currentMetaTags = []
8989
const updateMeta = () => {
90-
document.title = getTitle(this.$title, this.$page)
90+
document.title = this.$title
9191
document.documentElement.lang = this.$lang
9292
const meta = [
9393
{

0 commit comments

Comments
 (0)