From 2751f6611e4d98df3b8fc51fe7cf3c23ed37260f Mon Sep 17 00:00:00 2001 From: hoothin Date: Tue, 9 Jan 2024 12:22:31 +0800 Subject: [PATCH] update --- SearchJumper/searchJumper.user.js | 12 ++++++++---- SearchJumper/searchJumperDefaultConfig.js | 6 +----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SearchJumper/searchJumper.user.js b/SearchJumper/searchJumper.user.js index a66c8f5757f..84107dcbf3b 100644 --- a/SearchJumper/searchJumper.user.js +++ b/SearchJumper/searchJumper.user.js @@ -780,7 +780,7 @@ var value; if (ext) { let result = await chrome.storage.local.get([key]); - value = result[key]; + value = result && result[key]; } else if (this.supportGMPromise) { value = await GM.getValue(key); } else if (this.supportGM) { @@ -7901,7 +7901,7 @@ let si = se.querySelector("img"); let data = sites[i]; - if (localKeywords && data.kwFilter) { + if (data && localKeywords && data.kwFilter) { if (new RegExp(data.kwFilter).test(localKeywords)) { se.style.display = ''; } else { @@ -10956,6 +10956,9 @@ async function cacheFontManager(noti) { if (searchData.prefConfig.cacheSwitch) { + searchBar.con.classList.add("in-input"); + searchBar.con.style.visibility = "hidden"; + searchBar.appendBar(); let needCache = cacheFontPool.length > 0; while (cacheFontPool.length > 0) { await cacheAction(cacheFontPool.shift()); @@ -14394,6 +14397,7 @@ function checkVisibility() { if (document.hidden) { if (searchBar) searchBar.closeShowAll(); + else return; if (!searchData.prefConfig.globalSearchNow) return; checkGlobalIntv = setInterval(async () => { let oldGlobalInPageWords = globalInPageWords; @@ -14416,14 +14420,14 @@ storage.getItem("globalInPageWords", data => { globalInPageWords = (data || ''); if (oldGlobalInPageWords != globalInPageWords) { - searchBar.refreshPageWords(); + if (searchBar) searchBar.refreshPageWords(); } }); let oldNavEnable = navEnable || false; storage.getItem("navEnable", data => { navEnable = (typeof data === "undefined" ? true : data); if (oldNavEnable != navEnable) { - searchBar.refreshNav(); + if (searchBar) searchBar.refreshNav(); } }); }); diff --git a/SearchJumper/searchJumperDefaultConfig.js b/SearchJumper/searchJumperDefaultConfig.js index c94dc4e1ef2..5bf0e0311c1 100644 --- a/SearchJumper/searchJumperDefaultConfig.js +++ b/SearchJumper/searchJumperDefaultConfig.js @@ -1,3 +1,4 @@ +//Open setting page to change data, NOT HERE! let lang = navigator.appName === "Netscape" ? navigator.language : navigator.userLanguage; let sitesConfig = {}; switch (lang) { @@ -223,11 +224,6 @@ switch (lang) { "name": "F搜", "url": "https://fsoufsou.com/search?q=%s", "nobatch": true - }, - { - "name": "中国搜索", - "url": "https://www.chinaso.com/newssearch/all/allResults?q=%s", - "nobatch": true } ] },