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 emojis in case use_system_emojis == false #2220

Merged

Conversation

ChaosKid42
Copy link
Contributor

I found that emojis weren't rendered in case use_system_emojis == false. This PR fixes it.

@ChaosKid42 ChaosKid42 force-pushed the fix_emojis_if_not_system_emojis branch from c40b09f to 7ef31b0 Compare September 4, 2020 11:15
@jcbrand
Copy link
Member

jcbrand commented Sep 4, 2020

Thanks @ChaosKid42, looks good.

Could you please add a regressoin test to spec/emojis.js where Converse is configured with use_system_emojis set to false?

Similar to this one:

['rosterGroupsFetched', 'chatBoxesFetched'], {'use_system_emojis': true},

@ChaosKid42 ChaosKid42 force-pushed the fix_emojis_if_not_system_emojis branch from 7ef31b0 to c044b51 Compare September 4, 2020 16:30
@ChaosKid42
Copy link
Contributor Author

Thanks @ChaosKid42, looks good.

Could you please add a regressoin test to spec/emojis.js where Converse is configured with use_system_emojis set to false?

Similar to this one:

['rosterGroupsFetched', 'chatBoxesFetched'], {'use_system_emojis': true},

@jcbrand : Done.

@jcbrand jcbrand merged commit 6319f56 into conversejs:master Sep 5, 2020
@jcbrand
Copy link
Member

jcbrand commented Sep 5, 2020

Thanks!

@ChaosKid42 ChaosKid42 deleted the fix_emojis_if_not_system_emojis branch September 5, 2020 10:28
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.

None yet

2 participants