sascha
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename tributeValues to mentionValues (#25375) 

Very simple change, just rename this variable so it does not feature the
name of the module.
pull/25381/head
silverwind 2023-06-20 05:32:49 +07:00 committed by GitHub
parent 33cd74ad70
commit ef6f5f0124
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/base/head_script.tmpl
Unescape Escape View File

@ -17,7 +17,7 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly.
notificationSettings: {{NotificationSettings}}, {{/*a map provided by NewFuncMap in helper.go*/}} notificationSettings: {{NotificationSettings}}, {{/*a map provided by NewFuncMap in helper.go*/}}
enableTimeTracking: {{EnableTimetracking}}, enableTimeTracking: {{EnableTimetracking}},
{{if or .Participants .Assignees .MentionableTeams}} {{if or .Participants .Assignees .MentionableTeams}}
tributeValues: Array.from(new Map([ mentionValues: Array.from(new Map([
{{- range .Participants -}} {{- range .Participants -}}
['{{.Name}}', {key: '{{.Name}} {{.FullName}}', value: '{{.Name}}', name: '{{.Name}}', fullname: '{{.FullName}}', avatar: '{{.AvatarLink $.Context}}'}], ['{{.Name}}', {key: '{{.Name}} {{.FullName}}', value: '{{.Name}}', name: '{{.Name}}', fullname: '{{.FullName}}', avatar: '{{.AvatarLink $.Context}}'}],
{{- end -}} {{- end -}}

2
web_src/js/features/tribute.js
Unescape Escape 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.mentionValues,
requireLeadingSpace: true, requireLeadingSpace: true,
menuItemTemplate: (item) => { menuItemTemplate: (item) => {
return ` return `

2
web_src/js/test/setup.js
Unescape Escape View File

@ -3,7 +3,7 @@ window.config = {
pageData: {}, pageData: {},
i18n: {}, i18n: {},
appSubUrl: '', appSubUrl: '',
tributeValues: [ mentionValues: [
{key: 'user1 User 1', value: 'user1', name: 'user1', fullname: 'User 1', avatar: 'https://avatar1.com'}, {key: 'user1 User 1', value: 'user1', name: 'user1', fullname: 'User 1', avatar: 'https://avatar1.com'},
{key: 'user2 User 2', value: 'user2', name: 'user2', fullname: 'User 2', avatar: 'https://avatar2.com'}, {key: 'user2 User 2', value: 'user2', name: 'user2', fullname: 'User 2', avatar: 'https://avatar2.com'},
{key: 'user3 User 3', value: 'user3', name: 'user3', fullname: 'User 3', avatar: 'https://avatar3.com'}, {key: 'user3 User 3', value: 'user3', name: 'user3', fullname: 'User 3', avatar: 'https://avatar3.com'},

2
web_src/js/utils/match.js
Unescape Escape 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.mentionValues) {
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);

4
web_src/js/utils/match.test.js
Unescape Escape View File

@ -42,6 +42,6 @@ test('matchEmoji', () => {
}); });
test('matchMention', () => { test('matchMention', () => {
expect(matchMention('')).toEqual(window.config.tributeValues.slice(0, 6)); expect(matchMention('')).toEqual(window.config.mentionValues.slice(0, 6));
expect(matchMention('user4')).toEqual([window.config.tributeValues[3]]); expect(matchMention('user4')).toEqual([window.config.mentionValues[3]]);
}); });