fix: algolia check should be checking themeConfig.algolia

yyx990803 · yyx990803 · commit 504c21df0c62 · 2018-04-23T16:31:13.000-04:00
diff --git a/lib/default-theme/Navbar.vue b/lib/default-theme/Navbar.vue
@@ -28,11 +28,8 @@ import NavLinks from './NavLinks.vue'
 export default {
   components: { SidebarButton, NavLinks, SearchBox, AlgoliaSearchBox },
   computed: {
-    algolia () {
-      return this.$themeLocaleConfig.algolia || this.$site.themeConfig.algolia || {}
-    },
     isAlgoliaSearch () {
-      const algolia = this.algolia
+      const algolia = this.$themeLocaleConfig.algolia || this.$site.themeConfig.algolia || {}
       return algolia && algolia.apiKey && algolia.indexName
     }
   }
diff --git a/lib/prepare.js b/lib/prepare.js
@@ -121,7 +121,7 @@ async function resolveOptions (sourceDir) {
 
   // resolve algolia
   const isAlgoliaSearch = (
-    siteConfig.algolia ||
+    siteConfig.themeConfig.algolia ||
     Object.keys(siteConfig.locales && siteConfig.themeConfig && siteConfig.themeConfig.locales || {})
       .some(base => siteConfig.themeConfig.locales[base].algolia)
   )

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,8 @@ import NavLinks from './NavLinks.vue'`
`28`	`28`	`export default {`
`29`	`29`	`components: { SidebarButton, NavLinks, SearchBox, AlgoliaSearchBox },`
`30`	`30`	`computed: {`
`31`		`- algolia () {`
`32`		`- return this.$themeLocaleConfig.algolia \|\| this.$site.themeConfig.algolia \|\| {}`
`33`		`- },`
`34`	`31`	`isAlgoliaSearch () {`
`35`		`- const algolia = this.algolia`
	`32`	`+ const algolia = this.$themeLocaleConfig.algolia \|\| this.$site.themeConfig.algolia \|\| {}`
`36`	`33`	`return algolia && algolia.apiKey && algolia.indexName`
`37`	`34`	`}`
`38`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ async function resolveOptions (sourceDir) {`
`121`	`121`
`122`	`122`	`// resolve algolia`
`123`	`123`	`const isAlgoliaSearch = (`
`124`		`- siteConfig.algolia \|\|`
	`124`	`+ siteConfig.themeConfig.algolia \|\|`
`125`	`125`	`Object.keys(siteConfig.locales && siteConfig.themeConfig && siteConfig.themeConfig.locales \|\| {})`
`126`	`126`	`.some(base => siteConfig.themeConfig.locales[base].algolia)`
`127`	`127`	`)`