StarCitizenTools/mediawiki-skins-Citizen
1
0
Fork 0
mirror of https://github.com/StarCitizenTools/mediawiki-skins-Citizen.git synced 2024-11-15 02:24:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): hide redirect message in search results when not needed

Browse source 
If either the title or redirect title is a substring of the other,
hide the redirect.

Related: T303013
This commit is contained in:
alistair3149 2022-05-20 19:48:07 -04:00
parent a5c52e48b7
commit 726a348369
No known key found for this signature in database
GPG key ID: 94D081060FD3DD9C
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/skins.citizen.search/skins.citizen.search.less
View file

@ -42,7 +42,6 @@
align-items: center; align-items: center;
color: var( --color-base--emphasized ); color: var( --color-base--emphasized );
font-weight: 700; font-weight: 700;
gap: 0.25rem;
} }
&__highlight { &__highlight {
@ -51,6 +50,7 @@
} }
&__redirect { &__redirect {
margin-left: 0.25rem;
color: var( --color-base ); color: var( --color-base );
font-size: 0.8125rem; font-size: 0.8125rem;
} }

18
resources/skins.citizen.search/typeahead.js
View file

@ -157,6 +157,22 @@ function getSuggestions( searchQuery ) {
return text.replace( regex, '<span class="' + prefix + '__highlight">$&</span>' ); return text.replace( regex, '<span class="' + prefix + '__highlight">$&</span>' );
}; };
// Check if the redirect is useful
// See T303013
const isRedirectUseful = ( title, matchedTitle ) => {
// Change to lowercase then remove space and dashes
const cleanup = ( text ) => {
return text.toLowerCase().replace( /-|\s/g, '' );
};
title = cleanup( title );
matchedTitle = cleanup( matchedTitle );
// eslint thinks it is an array
// eslint-disable-next-line no-restricted-syntax
return !( title.includes( matchedTitle ) || matchedTitle.includes( title ) );
};
// Maybe there is a cleaner way? // Maybe there is a cleaner way?
// Maybe there is a faster way compared to multiple querySelector? // Maybe there is a faster way compared to multiple querySelector?
// Should I just use regular for loop for faster performance? // Should I just use regular for loop for faster performance?
@ -178,7 +194,7 @@ function getSuggestions( searchQuery ) {
// Result is a redirect // Result is a redirect
// Show the redirect title and highlight it // Show the redirect title and highlight it
if ( result.matchedTitle ) { if ( result.matchedTitle && isRedirectUseful( result.title, result.matchedTitle ) ) {
suggestionTitle.innerHTML = result.title + suggestionTitle.innerHTML = result.title +
'<span class="' + prefix + '__redirect">' + '<span class="' + prefix + '__redirect">' +
mw.message( 'search-redirect', highlightTitle( result.matchedTitle ) ).plain() + mw.message( 'search-redirect', highlightTitle( result.matchedTitle ) ).plain() +