test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

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

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