Skip to content

Commit d94754c

Browse files
committed
Update searchJumper.user.js
1 parent 31a7c63 commit d94754c

File tree

1 file changed

+76
-22
lines changed

1 file changed

+76
-22
lines changed

searchJumper.user.js

Lines changed: 76 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@
16381638
const logoBtnSvg = `<svg class="search-jumper-logoBtnSvg" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"><title>${_GM_info.script.name}</title><path d="M.736 510.464c0-281.942 228.335-510.5 510-510.5 135.26 0 264.981 53.784 360.625 149.522 95.643 95.737 149.375 225.585 149.375 360.978 0 281.94-228.335 510.5-510 510.5-281.665 0-510-228.56-510-510.5zm510-510.5v1021m-510-510.5h1020" fill="#fefefe"/><path d="M237.44 346.624a48.64 48.64 0 1 0 97.28 0 48.64 48.64 0 1 0-97.28 0zM699.904 346.624a48.64 48.64 0 1 0 97.28 0 48.64 48.64 0 1 0-97.28 0zM423.296 759.296c-64 0-115.712-52.224-115.712-115.712 0-26.624 9.216-52.224 25.6-72.704 9.216-11.776 26.112-13.312 37.888-4.096s13.312 26.112 4.096 37.888c-9.216 11.264-13.824 24.576-13.824 38.912 0 34.304 27.648 61.952 61.952 61.952s61.952-27.648 61.952-61.952c0-4.096-.512-8.192-1.024-11.776-2.56-14.848 6.656-28.672 21.504-31.744 14.848-2.56 28.672 6.656 31.744 21.504 1.536 7.168 2.048 14.336 2.048 22.016-.512 63.488-52.224 115.712-116.224 115.712z" fill="#333"/><path d="M602.08 760.296c-64 0-115.712-52.224-115.712-115.712 0-14.848 12.288-27.136 27.136-27.136s27.136 12.288 27.136 27.136c0 34.304 27.648 61.952 61.952 61.952s61.952-27.648 61.952-61.952c0-15.36-5.632-30.208-15.872-41.472-9.728-11.264-9.216-28.16 2.048-37.888 11.264-9.728 28.16-9.216 37.888 2.048 19.456 21.504 29.696 48.64 29.696 77.824 0 62.976-52.224 115.2-116.224 115.2z" fill="#333"/><ellipse ry="58" rx="125" cy="506.284" cx="201.183" fill="#faf"/><ellipse ry="58" rx="125" cy="506.284" cx="823.183" fill="#faf"/></svg>`;
16391639
const searchSvg = `<svg width="25" height="25" xmlns="http://www.w3.org/2000/svg" fill="currentcolor" viewBox="0 0 52.966 52.966"><path d="M51.704 51.273L36.844 35.82c3.79-3.8 6.14-9.04 6.14-14.82 0-11.58-9.42-21-21-21s-21 9.42-21 21 9.42 21 21 21c5.082 0 9.747-1.817 13.383-4.832l14.895 15.49c.196.206.458.308.72.308.25 0 .5-.093.694-.28.398-.382.41-1.015.028-1.413zM21.984 40c-10.478 0-19-8.523-19-19s8.522-19 19-19 19 8.523 19 19-8.525 19-19 19z"></path></svg>`;
16401640
const logoBase64 = "data:image/svg+xml;base64,PHN2ZyBjbGFzcz0ic2VhcmNoLWp1bXBlci1sb2dvQnRuU3ZnIiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGQ9Ik0uNzM2IDUxMC40NjRjMC0yODEuOTQyIDIyOC4zMzUtNTEwLjUgNTEwLTUxMC41IDEzNS4yNiAwIDI2NC45ODEgNTMuNzg0IDM2MC42MjUgMTQ5LjUyMiA5NS42NDMgOTUuNzM3IDE0OS4zNzUgMjI1LjU4NSAxNDkuMzc1IDM2MC45NzggMCAyODEuOTQtMjI4LjMzNSA1MTAuNS01MTAgNTEwLjUtMjgxLjY2NSAwLTUxMC0yMjguNTYtNTEwLTUxMC41em01MTAtNTEwLjV2MTAyMW0tNTEwLTUxMC41aDEwMjAiIGZpbGw9IiNmZWZlZmUiLz48cGF0aCBkPSJNMjM3LjQ0IDM0Ni42MjRhNDguNjQgNDguNjQgMCAxIDAgOTcuMjggMCA0OC42NCA0OC42NCAwIDEgMC05Ny4yOCAwek02OTkuOTA0IDM0Ni42MjRhNDguNjQgNDguNjQgMCAxIDAgOTcuMjggMCA0OC42NCA0OC42NCAwIDEgMC05Ny4yOCAwek00MjMuMjk2IDc1OS4yOTZjLTY0IDAtMTE1LjcxMi01Mi4yMjQtMTE1LjcxMi0xMTUuNzEyIDAtMjYuNjI0IDkuMjE2LTUyLjIyNCAyNS42LTcyLjcwNCA5LjIxNi0xMS43NzYgMjYuMTEyLTEzLjMxMiAzNy44ODgtNC4wOTZzMTMuMzEyIDI2LjExMiA0LjA5NiAzNy44ODhjLTkuMjE2IDExLjI2NC0xMy44MjQgMjQuNTc2LTEzLjgyNCAzOC45MTIgMCAzNC4zMDQgMjcuNjQ4IDYxLjk1MiA2MS45NTIgNjEuOTUyczYxLjk1Mi0yNy42NDggNjEuOTUyLTYxLjk1MmMwLTQuMDk2LS41MTItOC4xOTItMS4wMjQtMTEuNzc2LTIuNTYtMTQuODQ4IDYuNjU2LTI4LjY3MiAyMS41MDQtMzEuNzQ0IDE0Ljg0OC0yLjU2IDI4LjY3MiA2LjY1NiAzMS43NDQgMjEuNTA0IDEuNTM2IDcuMTY4IDIuMDQ4IDE0LjMzNiAyLjA0OCAyMi4wMTYtLjUxMiA2My40ODgtNTIuMjI0IDExNS43MTItMTE2LjIyNCAxMTUuNzEyeiIgZmlsbD0iIzMzMyIvPjxwYXRoIGQ9Ik02MDIuMDggNzYwLjI5NmMtNjQgMC0xMTUuNzEyLTUyLjIyNC0xMTUuNzEyLTExNS43MTIgMC0xNC44NDggMTIuMjg4LTI3LjEzNiAyNy4xMzYtMjcuMTM2czI3LjEzNiAxMi4yODggMjcuMTM2IDI3LjEzNmMwIDM0LjMwNCAyNy42NDggNjEuOTUyIDYxLjk1MiA2MS45NTJzNjEuOTUyLTI3LjY0OCA2MS45NTItNjEuOTUyYzAtMTUuMzYtNS42MzItMzAuMjA4LTE1Ljg3Mi00MS40NzItOS43MjgtMTEuMjY0LTkuMjE2LTI4LjE2IDIuMDQ4LTM3Ljg4OCAxMS4yNjQtOS43MjggMjguMTYtOS4yMTYgMzcuODg4IDIuMDQ4IDE5LjQ1NiAyMS41MDQgMjkuNjk2IDQ4LjY0IDI5LjY5NiA3Ny44MjQgMCA2Mi45NzYtNTIuMjI0IDExNS4yLTExNi4yMjQgMTE1LjJ6IiBmaWxsPSIjMzMzIi8+PGVsbGlwc2Ugcnk9IjU4IiByeD0iMTI1IiBjeT0iNTA2LjI4NCIgY3g9IjIwMS4xODMiIGZpbGw9IiNmYWYiLz48ZWxsaXBzZSByeT0iNTgiIHJ4PSIxMjUiIGN5PSI1MDYuMjg0IiBjeD0iODIzLjE4MyIgZmlsbD0iI2ZhZiIvPjwvc3ZnPg==";
1641-
const noImgBase64 = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAyNCIgaGVpZ2h0PSIxMDI0IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNNDI5LjAxMzMzMyA2NDBBMzIgMzIgMCAwIDEgMzg0IDU5NC45ODY2NjdsMzcuNzYtMzcuNzYtMjIuODI2NjY3LTIyLjYxMzMzNC0xMzUuNjggMTM1LjY4IDkwLjQ1MzMzNCA5MC40NTMzMzQgMTM1LjY4LTEzNS42OC0yMi42MTMzMzQtMjIuNjEzMzM0ek01MzQuNjEzMzMzIDM5OC45MzMzMzNsMjIuNjEzMzM0IDIyLjYxMzMzNEw1OTQuOTg2NjY3IDM4NEEzMiAzMiAwIDAgMSA2NDAgNDI5LjAxMzMzM2wtMzcuNzYgMzcuNzYgMjIuNjEzMzMzIDIyLjYxMzMzNCAxMzUuNjgtMTM1LjY4LTkwLjQ1MzMzMy05MC40NTMzMzR6IiBmaWxsPSIjNUU1QzVDIj48L3BhdGg+PHBhdGggZD0iTTUxMiAyMS4zMzMzMzNhNDkwLjY2NjY2NyA0OTAuNjY2NjY3IDAgMSAwIDQ5MC42NjY2NjcgNDkwLjY2NjY2N0E0OTAuNjY2NjY3IDQ5MC42NjY2NjcgMCAwIDAgNTEyIDIxLjMzMzMzM3ogbTMxNi44IDM1NC45ODY2NjdsLTE4MS4xMiAxODEuMTJhMzIgMzIgMCAwIDEtNDUuMjI2NjY3IDBMNTU3LjIyNjY2NyA1MTIgNTEyIDU1Ny4yMjY2NjdsNDUuMjI2NjY3IDQ1LjIyNjY2NmEzMiAzMiAwIDAgMSAwIDQ1LjIyNjY2N2wtMTgxLjEyIDE4MS4xMmEzMiAzMiAwIDAgMS00NS4yMjY2NjcgMGwtMTM1LjY4LTEzNS42OGEzMiAzMiAwIDAgMSAwLTQ1LjIyNjY2N2wxODEuMTItMTgxLjEyYTMyIDMyIDAgMCAxIDQ1LjIyNjY2NyAwTDQ2Ni43NzMzMzMgNTEyIDUxMiA0NjYuNzczMzMzbC00NS4yMjY2NjctNDUuMjI2NjY2YTMyIDMyIDAgMCAxIDAtNDUuMjI2NjY3bDE4MS4xMi0xODEuMTJhMzIgMzIgMCAwIDEgNDUuMjI2NjY3IDBsMTM1LjY4IDEzNS42OGEzMiAzMiAwIDAgMSAwIDQ1LjIyNjY2N3oiIGZpbGw9IiM1RTVDNUMiPjwvcGF0aD4KPC9zdmc+";
1641+
const noImgBase64 = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDI0IiBoZWlnaHQ9IjEwMjQiPjxwYXRoIGQ9Ik00MjkuMDEzMzMzIDY0MEEzMiAzMiAwIDAgMSAzODQgNTk0Ljk4NjY2N2wzNy43Ni0zNy43Ni0yMi44MjY2NjctMjIuNjEzMzM0LTEzNS42OCAxMzUuNjggOTAuNDUzMzM0IDkwLjQ1MzMzNCAxMzUuNjgtMTM1LjY4LTIyLjYxMzMzNC0yMi42MTMzMzR6TTUzNC42MTMzMzMgMzk4LjkzMzMzM2wyMi42MTMzMzQgMjIuNjEzMzM0TDU5NC45ODY2NjcgMzg0QTMyIDMyIDAgMCAxIDY0MCA0MjkuMDEzMzMzbC0zNy43NiAzNy43NiAyMi42MTMzMzMgMjIuNjEzMzM0IDEzNS42OC0xMzUuNjgtOTAuNDUzMzMzLTkwLjQ1MzMzNHoiIGZpbGw9IiNhMGEwYTAiLz48cGF0aCBkPSJNNTEyIDIxLjMzMzMzM2E0OTAuNjY2NjY3IDQ5MC42NjY2NjcgMCAxIDAgNDkwLjY2NjY2NyA0OTAuNjY2NjY3QTQ5MC42NjY2NjcgNDkwLjY2NjY2NyAwIDAgMCA1MTIgMjEuMzMzMzMzeiBtMzE2LjggMzU0Ljk4NjY2N2wtMTgxLjEyIDE4MS4xMmEzMiAzMiAwIDAgMS00NS4yMjY2NjcgMEw1NTcuMjI2NjY3IDUxMiA1MTIgNTU3LjIyNjY2N2w0NS4yMjY2NjcgNDUuMjI2NjY2YTMyIDMyIDAgMCAxIDAgNDUuMjI2NjY3bC0xODEuMTIgMTgxLjEyYTMyIDMyIDAgMCAxLTQ1LjIyNjY2NyAwbC0xMzUuNjgtMTM1LjY4YTMyIDMyIDAgMCAxIDAtNDUuMjI2NjY3bDE4MS4xMi0xODEuMTJhMzIgMzIgMCAwIDEgNDUuMjI2NjY3IDBMNDY2Ljc3MzMzMyA1MTIgNTEyIDQ2Ni43NzMzMzNsLTQ1LjIyNjY2Ny00NS4yMjY2NjZhMzIgMzIgMCAwIDEgMC00NS4yMjY2NjdsMTgxLjEyLTE4MS4xMmEzMiAzMiAwIDAgMSA0NS4yMjY2NjcgMGwxMzUuNjggMTM1LjY4YTMyIDMyIDAgMCAxIDAgNDUuMjI2NjY3eiIgZmlsbD0iI2EwYTBhMCIvPjwvc3ZnPg==";
16421642
const closePath = '<path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64z m165.4 618.2l-66-0.3L512 563.4l-99.3 118.4-66.1 0.3c-4.4 0-8-3.5-8-8 0-1.9 0.7-3.7 1.9-5.2l130.1-155L340.5 359c-1.2-1.5-1.9-3.3-1.9-5.2 0-4.4 3.6-8 8-8l66.1 0.3L512 464.6l99.3-118.4 66-0.3c4.4 0 8 3.5 8 8 0 1.9-0.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"></path>';
16431643
const wordParam = "%s[lurest]?\\b";
16441644
const wordParamReg = new RegExp(wordParam);
@@ -1951,6 +1951,7 @@
19511951
}
19521952
#search-jumper.search-jumper-showall #search-jumper-alllist.new-mode>.sitelistBox .sitelist:hover {
19531953
opacity: 1;
1954+
backdrop-filter: blur(5px);
19541955
}
19551956
#search-jumper.search-jumper-showall>.search-jumper-showallBg {
19561957
display: block;
@@ -2009,7 +2010,7 @@
20092010
justify-content: center;
20102011
left: 0;
20112012
top: 60px;
2012-
background: #ffffffee;
2013+
background: #ffffffdd;
20132014
border-bottom: 1px solid #ddd;
20142015
pointer-events: all;
20152016
min-height: 40px;
@@ -2144,12 +2145,26 @@
21442145
pointer-events: none;
21452146
}
21462147
#search-jumper #search-jumper-alllist.new-mode .sitelist a>img {
2147-
width: 48px;
2148-
height: 48px;
2148+
width: 38px;
2149+
height: 38px;
21492150
float: left;
2150-
margin-left: -20px;
2151+
margin-left: -10px;
2152+
margin-top: 5px;
21512153
transform: scale(1);
2152-
transition: transform 0.5s ease;
2154+
border-radius: 10%;
2155+
transition: transform 0.25s ease;
2156+
}
2157+
#search-jumper #search-jumper-alllist.new-mode .sitelist a:before {
2158+
content: '';
2159+
position: absolute;
2160+
width: 38px;
2161+
height: 38px;
2162+
float: left;
2163+
margin-left: -20px;
2164+
margin-top: -5px;
2165+
background: #ffffff30;
2166+
border-radius: 50%;
2167+
padding: 10px;
21532168
}
21542169
#search-jumper #search-jumper-alllist.new-mode .sitelist a>p {
21552170
-webkit-line-clamp: 2;
@@ -2160,11 +2175,11 @@
21602175
line-height: 21px;
21612176
margin-bottom: 8px;
21622177
margin-top: 0px;
2163-
margin-left: 40px;
2178+
margin-left: 45px;
21642179
overflow: hidden;
21652180
text-overflow: ellipsis;
21662181
white-space: nowrap;
2167-
transition: color 0.5s ease;
2182+
transition: color 0.25s ease;
21682183
}
21692184
#search-jumper #search-jumper-alllist.new-mode .sitelist a:hover>p {
21702185
color: #f1404b;
@@ -3100,15 +3115,15 @@
31003115
border-radius: 10px;
31013116
box-shadow: 0px 0px 10px 0px #7a7a7a;
31023117
padding: 0 0 10px 0;
3103-
background-color: rgba(255, 255, 255, 0.8);
3118+
background-color: #ffffffbb;
31043119
-moz-transition: background-color 0.3s ease;
31053120
-webkit-transition: background-color 0.3s ease;
31063121
transition: background-color 0.3s ease;
31073122
opacity: 1;
31083123
border: 0;
31093124
}
31103125
#search-jumper .sitelistBox:hover>.sitelist>.sitelistCon {
3111-
background-color: rgba(255, 255, 255, 1);
3126+
background-color: rgba(255, 255, 255, 0.8);
31123127
}
31133128
#search-jumper .sitelist>.sitelistCon:hover {
31143129
opacity: 1;
@@ -3145,7 +3160,7 @@
31453160
font-family: Arial, sans-serif,微软雅黑,"Noto Sans SC";
31463161
line-height: 25px;
31473162
margin: 5px auto;
3148-
color: #484b4f;
3163+
color: #282a2d;
31493164
flex: 1;
31503165
text-align: left;
31513166
white-space: nowrap;
@@ -3168,12 +3183,12 @@
31683183
pointer-events: none;
31693184
}
31703185
#search-jumper .sitelist>.sitelistCon>p {
3171-
color: #565656;
3186+
color: #282a2d;
31723187
text-align: center;
31733188
font-size: 16px;
31743189
font-family: Arial, sans-serif,微软雅黑,"Noto Sans SC";
31753190
font-weight: bold;
3176-
background: #f6f6f6cc;
3191+
border-bottom: 1px solid #9e9e9e1a;
31773192
border-radius: 10px 10px 0 0;
31783193
overflow: hidden;
31793194
white-space: nowrap;
@@ -4010,10 +4025,6 @@
40104025
border-top-color: white;
40114026
}
40124027
@media (prefers-color-scheme: dark) {
4013-
/* 站点列表 */
4014-
#search-jumper .sitelist > .sitelistCon > p {
4015-
background-color: #252B32 !important;
4016-
}
40174028
#search-jumper.search-jumper-showall #filterSites {
40184029
background-color: #2a282cc0;
40194030
}
@@ -4027,6 +4038,15 @@
40274038
background-color: #1C2127ee !important;
40284039
box-shadow: 0px 0px 10px 0px #1c1c1c;
40294040
}
4041+
#search-jumper.search-jumper-showall .sitelist > .sitelistCon {
4042+
background-color: #1C212760 !important;
4043+
}
4044+
#search-jumper.search-jumper-showall .sitelist > .sitelistCon:hover {
4045+
background-color: #1C2127dd !important;
4046+
}
4047+
#search-jumper.search-jumper-showall #search-jumper-alllist.new-mode .sitelist>.sitelistCon:hover {
4048+
background-color: #1C212788 !important;
4049+
}
40304050

40314051
#search-jumper .sitelist > .sitelistCon > div:hover {
40324052
background-color: #283C57 !important;
@@ -4057,7 +4077,7 @@
40574077

40584078
/* 历史列表 */
40594079
.search-jumper-historylistcon {
4060-
background-color: #181C20e0 !important;
4080+
background-color: #181C2060 !important;
40614081
border-bottom: 1px solid #252b32;
40624082
}
40634083

@@ -10277,6 +10297,35 @@
1027710297
return null;
1027810298
}
1027910299

10300+
async switchChinese(target, str) {
10301+
const windowScatcFunc = target === "sc" ? _unsafeWindow.tc2sc : _unsafeWindow.sc2tc;
10302+
if (windowScatcFunc) {
10303+
return windowScatcFunc(str);
10304+
}
10305+
let self = this;
10306+
if (!self.switchChineseResolve) {
10307+
window.addEventListener("message", function(event) {
10308+
if (event.data && event.data.type === "switchChineseResult") {
10309+
const receivedData = event.data.payload;
10310+
self.switchChineseResolve(receivedData);
10311+
}
10312+
});
10313+
}
10314+
return new Promise(resolve => {
10315+
self.switchChineseResolve = resolve;
10316+
window.postMessage({
10317+
type: "switchChineseRequest",
10318+
payload: {
10319+
target,
10320+
str
10321+
}
10322+
}, "*");
10323+
setTimeout(() => {
10324+
resolve("");
10325+
}, 300);
10326+
});
10327+
}
10328+
1028010329
async createSiteBtn(icon, data, openInNewTab, isBookmark, typeData, isHistoryBtn) {
1028110330
let self = this;
1028210331
let ele = document.createElement("a");
@@ -10471,6 +10520,7 @@
1047110520
} else ele.setAttribute("target", "_self");
1047210521
}
1047310522
let dataUrl = data.url;
10523+
let needSwitchChinese = /%s[st]\b/.test(dataUrl);
1047410524
let hasWordParam = wordParamReg.test(dataUrl);
1047510525
if (hasWordParam) ele.dataset.txt = true;
1047610526
if (/%[tb]\b/i.test(dataUrl)) {
@@ -10829,16 +10879,20 @@
1082910879
keywordsR = keywords;
1083010880
keywordsU = keywordsR.toUpperCase();
1083110881
keywordsL = keywordsR.toLowerCase();
10832-
keywordsSC = _unsafeWindow.tc2sc ? _unsafeWindow.tc2sc(keywordsR) : keywordsR;
10833-
keywordsTC = _unsafeWindow.sc2tc ? _unsafeWindow.sc2tc(keywordsR) : keywordsR;
10882+
if (needSwitchChinese) {
10883+
keywordsSC = await self.switchChinese("sc", keywordsR);
10884+
keywordsTC = await self.switchChinese("tc", keywordsR);
10885+
}
1083410886
if (!needDecode) keywords = encodeURIComponent(keywords);
1083510887
resultUrl = customReplaceKeywords(resultUrl);
1083610888
} else if (keywords && (!keywordsU && !keywordsL && !keywordsR)) {
1083710889
keywordsR = keywords;
1083810890
keywordsU = keywordsR.toUpperCase();
1083910891
keywordsL = keywordsR.toLowerCase();
10840-
keywordsSC = _unsafeWindow.tc2sc ? _unsafeWindow.tc2sc(keywordsR) : keywordsR;
10841-
keywordsTC = _unsafeWindow.sc2tc ? _unsafeWindow.sc2tc(keywordsR) : keywordsR;
10892+
if (needSwitchChinese) {
10893+
keywordsSC = await self.switchChinese("sc", keywordsR);
10894+
keywordsTC = await self.switchChinese("tc", keywordsR);
10895+
}
1084210896
if (!needDecode) keywords = encodeURIComponent(keywords);
1084310897
}
1084410898
if (targetUrl === '') {

0 commit comments

Comments
 (0)