tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues with updated emoji mart (#7761)

Browse Source 
* Changes behavior from search light to keep custom search
The new version of emoji-mart needs the search function to constantly
receive the custom emoji array. This changes the behavior back to the
previous one in the search light method to keep the emoji autocomplete
as before

* Change test order
The order was breaking the tests

* Fix codeclimate issues

* Update to emoji mart to version without issue in picker

Fixes #7760
This commit is contained in:
Renato "Lond" Cerqueira
2018-06-08 13:28:04 +02:00
committed by Eugen Rochko
parent 6671297e7a
commit 85470ec872
3 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/mastodon/features/emoji/emoji_mart_search_light.js
View File

@ -54,9 +54,13 @@ function addCustomToPool(custom, pool) {
index = {};
}
function search(value, { emojisToShowFilter, maxResults, include, exclude, custom = [] } = {}) {
if (customEmojisList !== custom)
addCustomToPool(custom, originalPool);
function search(value, { emojisToShowFilter, maxResults, include, exclude, custom } = {}) {
if (custom !== undefined) {
if (customEmojisList !== custom)
addCustomToPool(custom, originalPool);
} else {
custom = [];
}
maxResults = maxResults || 75;
include = include || [];