therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'better-still-emoji' into proper-attachments

Browse source 
* better-still-emoji:
  fix links sticking to mentionsline
This commit is contained in:
Henry Jameson 2021-08-15 18:11:57 +03:00
commit 5431d8fe55
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/mentions_line/mentions_line.scss
View file

@ -4,7 +4,7 @@
color: var(--link);
}
.mention-link:not(:last-child) {
.mention-link {
margin-right: 0.25em;
}
}

7
src/components/rich_content/rich_content.jsx
View file

@ -121,6 +121,13 @@ export default Vue.component('RichContent', {
// in MentionsLine
return currentMentions !== null ? item.trim() : item
}
// We add space with mentionsLine, otherwise non-text elements will
// stick to them.
if (currentMentions !== null) {
// single whitespace trim
item = item[0].match(/\s/) ? item.slice(1) : item
}
currentMentions = null
if (item.includes(':')) {
item = ['', processTextForEmoji(