OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3884 from matrix-org/t3chguy/emoji_space_complete 

Fix emoticon space completion for upper case emoticons like :D xD
pull/21833/head
Michael Telatynski 2020-01-21 11:01:40 +00:00 committed by GitHub
parent ff8ee5cc7d 26bba4416b
commit adec308529
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/rooms/BasicMessageComposer.js
View File

@ -107,8 +107,9 @@ export default class BasicMessageEditor extends React.Component {
});
const emoticonMatch = REGEX_EMOTICON_WHITESPACE.exec(range.text);
if (emoticonMatch) {
const query = emoticonMatch[1].toLowerCase().replace("-", "");
const data = EMOTICON_TO_EMOJI.get(query);
const query = emoticonMatch[1].replace("-", "");
// try both exact match and lower-case, this means that xd won't match xD but :P will match :p
const data = EMOTICON_TO_EMOJI.get(query) || EMOTICON_TO_EMOJI.get(query.toLowerCase());
if (data) {
const {partCreator} = model;