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

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

Match by emoji ascii regex first before shorthand
pull/21833/head
Luke Barnard 2017-06-30 16:54:36 +01:00 committed by GitHub
parent 0b46184a21 b315ed630e
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 // 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( const EMOJI_SHORTNAMES = Object.keys(EmojiData).map((key) => EmojiData[key]).sort(
(a, b) => { (a, b) => {
if (a.category === b.category) { if (a.category === b.category) {