gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 19

Update to emojimart 2.6.1 (#7746)

Browse source 
* Update to emojimart 2.6.1
WIP using local updated version. Sheet comes from emoji-data@4.0.4,
file sheet_twitter_32_indexed_256.png.

* Update to 2.6.1 and uncompress data if needed

* Remove changes that were not needed

* Fix yarn lock file

* Match emojiToShowFilter behavior to new version of emoji-mart

* Fix codeclimate issue

* Match custom emoji behavior to new version of emoji-mart

* Replace emoji without shortcode in tests

* Fix code climate issues
This commit is contained in:
Renato "Lond" Cerqueira 2018-06-07 19:40:23 +02:00 • committed by Eugen Rochko
parent 2304d52599
commit 0c3ce41031
7 changed files with 54 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/emoji/emoji_picker.js
View file

@ -1,5 +1,5 @@
import Picker from 'emoji-mart/dist-es/components/picker';
import Emoji from 'emoji-mart/dist-es/components/emoji';
import Picker from 'emoji-mart/dist-es/components/picker/picker';
import Emoji from 'emoji-mart/dist-es/components/emoji/emoji';
export {
Picker,