egtyl/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not show No match found for tribute (#16231)

Browse source 
Tribute.js will show an untranslated no match found if no emoji or mentions.

Further the mentions should really require a preceding space.

This PR fixes both of these.

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2021-06-24 00:02:23 +01:00 committed by GitHub
parent 5f2ef17fdb
commit d13a0e621b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web_src/js/features/tribute.js
View file

@ -32,7 +32,7 @@ function makeCollections({mentions, emoji}) {
if (emoji) { if (emoji) {
collections.push({ collections.push({
values: window.config.tributeValues, values: window.config.tributeValues,
noMatchTemplate: () => null, requireLeadingSpace: true,
menuItemTemplate: (item) => { menuItemTemplate: (item) => {
return ` return `
<div class="tribute-item"> <div class="tribute-item">
@ -69,7 +69,7 @@ export default async function attachTribute(elementOrNodeList, {mentions, emoji}
emoji: emoji || emojiNodes.length > 0, emoji: emoji || emojiNodes.length > 0,
}); });
const tribute = new Tribute({collection: collections}); const tribute = new Tribute({collection: collections, noMatchTemplate: ''});
for (const node of uniqueNodes) { for (const node of uniqueNodes) {
tribute.attach(node); tribute.attach(node);
} }