Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to emojimart 2.6.1 #7746

Merged

Conversation

renatolond
Copy link
Contributor

Sheet comes from emoji-data@4.0.4, file sheet_twitter_32_indexed_256.png.

WIP using local updated version. Sheet comes from emoji-data@4.0.4,
file sheet_twitter_32_indexed_256.png.
const { uncompress: emojiMartUncompress } = require('emoji-mart/dist/utils/data');
let data = require('emoji-mart/data/all.json');
if(data.compressed) {
data = emojiMartUncompress(data);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this whole if is needed. When I was developing I saw the compressed version of the file, but since then I'm only seeing the uncompressed and I don't know if it's some weird caching.

@renatolond
Copy link
Contributor Author

I don't know how @nolanlawson generated app/javascript/mastodon/features/emoji/emoji_map.json, I believe it probably needs to be regenerated for this update 🤔

@renatolond
Copy link
Contributor Author

This will partially solve #5579 (it updates to unicode 10. Seems like emoji mart does not support 11 yet).

@Gargron Gargron merged commit 0c3ce41 into mastodon:master Jun 7, 2018
lawremipsum pushed a commit to lawremipsum/mspsocial-mastodon that referenced this pull request Jul 7, 2018
* 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
@renatolond renatolond deleted the update_emoji_mart_to_2_6_1 branch October 30, 2018 08:42
handholdinginc pushed a commit to handholdinginc/social that referenced this pull request May 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants