diff options
| author | Chris <ccbrown112@gmail.com> | 2017-07-25 11:47:03 -0700 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-07-25 14:47:03 -0400 |
| commit | d49419776de0811732db59eae90c5c6da223f076 (patch) | |
| tree | 1b684895f37c6f91e239d1f3930c28a652fbcac4 /webapp/tests | |
| parent | e5e450fc097c14110e942731018041cd1931aa25 (diff) | |
| download | chat-d49419776de0811732db59eae90c5c6da223f076.tar.gz chat-d49419776de0811732db59eae90c5c6da223f076.tar.bz2 chat-d49419776de0811732db59eae90c5c6da223f076.zip | |
Refresh the emoji library (#7001)
* refresh the emoji library
* fix img_trans.gif
* compress sprite sheet
* remove note on compression - webpack seems to handle compression decently
* better emoji sheet preloading
* requested changes
Diffstat (limited to 'webapp/tests')
| -rw-r--r-- | webapp/tests/utils/formatting_hashtags.test.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/tests/utils/formatting_hashtags.test.jsx b/webapp/tests/utils/formatting_hashtags.test.jsx index cba7322ff..ee18a7769 100644 --- a/webapp/tests/utils/formatting_hashtags.test.jsx +++ b/webapp/tests/utils/formatting_hashtags.test.jsx @@ -184,8 +184,8 @@ describe('TextFormatting.Hashtags', function() { ); assert.equal( - TextFormatting.formatText('#:taco:').trim(), - '<p>#<span alt=":taco:" class="emoticon" title=":taco:" style="background-image:url(/static/emoji/taco.png)"></span></p>' + TextFormatting.formatText('#:mattermost:').trim(), + '<p>#<span alt=":mattermost:" class="emoticon" title=":mattermost:" style="background-image:url(/static/emoji/mattermost.png)"></span></p>' ); assert.equal( |