thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Avoiding accessing undefined tributeValues #26461 (#26462)

Browse source 
Backport #26461

(cherry picked from commit 9112ce22a4)
This commit is contained in:
wxiaoguang 2023-08-12 16:30:29 +08:00 committed by Earl Warren
parent 3e48942b1e
commit a12ea7a7cd
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@ function makeCollections({mentions, emoji}) {
if (mentions) { if (mentions) {
collections.push({ collections.push({
values: window.config.tributeValues, values: window.config.tributeValues ?? [],
requireLeadingSpace: true, requireLeadingSpace: true,
menuItemTemplate: (item) => { menuItemTemplate: (item) => {
return ` return `

2
web_src/js/utils/match.js
View file

@ -32,7 +32,7 @@ export function matchMention(queryText) {
// results is a map of weights, lower is better // results is a map of weights, lower is better
const results = new Map(); const results = new Map();
for (const obj of window.config.tributeValues) { for (const obj of window.config.tributeValues ?? []) {
const index = obj.key.toLowerCase().indexOf(query); const index = obj.key.toLowerCase().indexOf(query);
if (index === -1) continue; if (index === -1) continue;
const existing = results.get(obj); const existing = results.get(obj);