mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-10-17 18:32:20 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1168 from matrix-org/luke/fix-rte-ascii-suggestions

Browse Source 
Match by emoji ascii regex first before shorthand
This commit is contained in:
Luke Barnard 2017-06-30 16:54:36 +01:00 committed by GitHub
commit 0864ad9c8a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/autocomplete/EmojiProvider.js
View File

@ -41,7 +41,7 @@ const CATEGORY_ORDER = [
];
// Match for ":wink:" or ascii-style ";-)" provided by emojione
const EMOJI_REGEX = new RegExp('(:\\w*:?|' + asciiRegexp + ')', 'g');
const EMOJI_REGEX = new RegExp('(' + asciiRegexp + '|:\\w*:?)', 'g');
const EMOJI_SHORTNAMES = Object.keys(EmojiData).map((key) => EmojiData[key]).sort(
(a, b) => {
if (a.category === b.category) {