krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(chat): less intrusive highlight and better margins

Browse Source
This commit is contained in:
Sabe Jones
2018-11-14 16:31:35 -06:00
parent c035435476
commit 07cbf45265
2 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/client/components/chat/chatCard.vue
View File

@@ -211,7 +211,7 @@ export default {
const escapedDisplayName = escapeRegExp(displayName);
const escapedUsername = escapeRegExp(username);
const pattern = `@(${escapedUsername}|${escapedDisplayName})([^\w]|$)`;
const pattern = `@(${escapedUsername}|${escapedDisplayName})(\\b)`;
const precedingChar = messageText.substring(mentioned - 1, mentioned);
if (mentioned === 0 || precedingChar.trim() === '' || precedingChar === '@') {
let regex = new RegExp(pattern, 'i');
@@ -294,7 +294,7 @@ export default {
this.$emit('show-member-modal', memberId);
},
atHighlight (text) {
return text.replace(new RegExp(/(?!\b)@[\w-]+/g), match => {
return text.replace(new RegExp(`@(${this.user.auth.local.username}|${this.user.profile.name})(?:\\b)`, 'gi'), match => {
return `<span class="at-highlight">${match}</span>`;
});
},