matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Alter EMOJI_REGEX to include end of string ($)

Browse Source 
Fixes https://github.com/vector-im/riot-web/issues/4529 because the match must include the remainder of the query.
This commit is contained in:
Luke Barnard
2017-07-06 18:11:46 +01:00
parent 3e93930dcc
commit 0a4f8ffead
1 changed files with 1 additions and 1 deletions
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('(' + asciiRegexp + '|:\\w*:?)', '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) {