saul365/LoveIt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(search): theme.js error when search is disabled (#310)

Browse Source
This commit is contained in:
Dillon
2020-05-03 11:06:10 +08:00
committed by GitHub
parent 971eff815c
commit 09a7c95362
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/theme.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
assets/js/theme.min.js.map
View File

File diff suppressed because one or more lines are too long

2
layouts/_default/baseof.html
View File

@@ -10,7 +10,7 @@
{{- end -}} {{- end -}}
{{- $params := .Params | merge .Site.Params.page -}} {{- $params := .Params | merge .Site.Params.page -}}
{{- .Scratch.Set "version" "0.2.4" -}} {{- .Scratch.Set "version" "0.2.5" -}}
{{- if eq hugo.Environment "production" -}} {{- if eq hugo.Environment "production" -}}
{{- .Scratch.Set "cdn" .Site.Params.cdn -}} {{- .Scratch.Set "cdn" .Site.Params.cdn -}}

22
src/js/theme.js
View File

@@ -94,17 +94,19 @@ class Theme {
initSearch() { initSearch() {
const searchConfig = this.config.search; const searchConfig = this.config.search;
const isMobile = this.util.isMobile();
if (!searchConfig || isMobile && this._searchMobileOnce || !isMobile && this._searchDesktopOnce) return;
if (!searchConfig.maxResultLength) searchConfig.maxResultLength = 10; if (!searchConfig.maxResultLength) searchConfig.maxResultLength = 10;
if (!searchConfig.snippetLength) searchConfig.snippetLength = 50; if (!searchConfig.snippetLength) searchConfig.snippetLength = 50;
if (!searchConfig.highlightTag) searchConfig.highlightTag = 'em'; if (!searchConfig.highlightTag) searchConfig.highlightTag = 'em';
const isMobile = this.util.isMobile();
if (!searchConfig || isMobile && this._searchMobileOnce || !isMobile && this._searchDesktopOnce) return; const suffix = isMobile ? 'mobile' : 'desktop';
const classSuffix = isMobile ? 'mobile' : 'desktop'; const $header = document.getElementById(`header-${suffix}`);
const $header = document.getElementById(`header-${classSuffix}`); const $searchInput = document.getElementById(`search-input-${suffix}`);
const $searchInput = document.getElementById(`search-input-${classSuffix}`); const $searchToggle = document.getElementById(`search-toggle-${suffix}`);
const $searchToggle = document.getElementById(`search-toggle-${classSuffix}`); const $searchLoading = document.getElementById(`search-loading-${suffix}`);
const $searchLoading = document.getElementById(`search-loading-${classSuffix}`); const $searchClear = document.getElementById(`search-clear-${suffix}`);
const $searchClear = document.getElementById(`search-clear-${classSuffix}`);
if (isMobile) { if (isMobile) {
this._searchMobileOnce = true; this._searchMobileOnce = true;
$searchInput.addEventListener('focus', () => { $searchInput.addEventListener('focus', () => {
@@ -156,10 +158,10 @@ class Theme {
}, false); }, false);
const initAutosearch = () => { const initAutosearch = () => {
const autosearch = autocomplete(`#search-input-${classSuffix}`, { const autosearch = autocomplete(`#search-input-${suffix}`, {
hint: false, hint: false,
autoselect: true, autoselect: true,
dropdownMenuContainer: `#search-dropdown-${classSuffix}`, dropdownMenuContainer: `#search-dropdown-${suffix}`,
clearOnSelected: true, clearOnSelected: true,
cssClasses: { noPrefix: true }, cssClasses: { noPrefix: true },
debug: true, debug: true,

2
theme.toml
View File

@@ -5,7 +5,7 @@ name = "LoveIt"
license = "MIT" license = "MIT"
licenselink = "https://github.com/dillonzq/LoveIt/blob/master/LICENSE" licenselink = "https://github.com/dillonzq/LoveIt/blob/master/LICENSE"
description = "A Clean, Elegant but Advanced Hugo Theme for Hugo." description = "A Clean, Elegant but Advanced Hugo Theme for Hugo."
homepage = "https://hugo-loveit-en.netlify.com" homepage = "https://hugoloveit.com"
tags = [ tags = [
"blog", "blog",
"clean", "clean",