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

Fix custom emoji in emoji picker, persist skin tone #5258

Merged
merged 1 commit into from Oct 7, 2017

Conversation

@Gargron
Copy link
Member

commented Oct 7, 2017

  • Fix regression from #5256
  • Improve emoji picker loading animation
  • Persist skin tone selection in web settings
  • Re-order categories so "custom" is on top
@Gargron Gargron added bug ui labels Oct 7, 2017
@Gargron Gargron force-pushed the fix-emoji-picker branch from f6e9a40 to 5c06535 Oct 7, 2017
@nolanlawson

This comment has been minimized.

Copy link
Collaborator

commented Oct 7, 2017

LGTM, but how did this regress exactly? We upgraded from emoji-mart 2.0.1 to 2.1.1, there shouldn't have been any breaking changes…

from {
transform: scale(1);
transform-origin: center center;
animation-timing-function: ease-out;

This comment has been minimized.

Copy link
@nolanlawson

nolanlawson Oct 7, 2017

Collaborator

This new animation is cute, but why do we need to change the animation-timing-function in each keyframe? Can't we just set animation-timing-function: ease-in-out once here?

This comment has been minimized.

Copy link
@nolanlawson

nolanlawson Oct 7, 2017

Collaborator

This is what I'm talking about; I just tested in Chrome and Firefox and it looks the same to me…

This comment has been minimized.

Copy link
@Gargron
@keyframes heartbeat {
from {
transform: scale(1);
transform-origin: center center;

This comment has been minimized.

Copy link
@nolanlawson

nolanlawson Oct 7, 2017

Collaborator

transform-origin: center center; should normally go inside of the .pulse-loading {} instead of here; this might technically work in some browsers but seems safer to me not to put it here.

@Gargron

This comment has been minimized.

Copy link
Member Author

commented Oct 7, 2017

@nolanlawson

LGTM, but how did this regress exactly?

There were no custom emojis in the emoji picker at all! In the async loading code, there was the EmojiMart.emojiIndex.search line, which was supposed to add them, which did nothing because EmojiMart.emojiIndex was undefined. There is some complicated stuff going on there so I just opted to just pass the emojis into the Picker component instead.

@Gargron Gargron merged commit d2dee6e into master Oct 7, 2017
3 checks passed
3 checks passed
codeclimate All good!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@Gargron Gargron deleted the fix-emoji-picker branch Oct 7, 2017
@nolanlawson

This comment has been minimized.

Copy link
Collaborator

commented Oct 9, 2017

EmojiMart.emojiIndex was undefined

I think that was my bad; I forgot to export it from emoji_picker.js.

rutan added a commit to rutan/mastodon that referenced this pull request Oct 11, 2017
takayamaki added a commit to takayamaki/mastodon that referenced this pull request Oct 12, 2017
cobodo pushed a commit to cobodo/mastodon that referenced this pull request Oct 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.