emoji: Change fallback emojiset for text emojiset.

Now that we have added back support for `google-blob` emojiset,
changing the fallback emojiset for `text` emojiset to `google-blob`
make sense.
This commit is contained in:
Harshit Bansal 2018-08-31 17:56:48 +00:00 committed by Tim Abbott
parent 18a4239d7e
commit 20aee7b116
4 changed files with 5 additions and 5 deletions

View File

@ -56,8 +56,8 @@ run_test('initialize', () => {
emoji.initialize();
assert(image_stub);
assert.equal(calls, 2);
assert.deepEqual(urls, ['/static/generated/emoji/sheet-google-64.png',
'/static/generated/emoji/images-google-64/1f419.png']);
assert.deepEqual(urls, ['/static/generated/emoji/sheet-google-blob-64.png',
'/static/generated/emoji/images-google-blob-64/1f419.png']);
});
run_test('get_canonical_name', () => {

View File

@ -91,7 +91,7 @@ exports.initialize = function initialize() {
// for displaying emojis in emoji picker and composebox
// typeahead. This logic ensures that we do sprite sheet
// prefetching for that case.
emojiset = 'google';
emojiset = 'google-blob';
}
// Load the sprite image and octopus image in the background, so
// that the browser will cache it for later use.

View File

@ -872,5 +872,5 @@ class HomeTest(ZulipTestCase):
self.assertEqual(result.status_code, 200)
html = result.content.decode('utf-8')
self.assertIn('google-sprite.css', html)
self.assertIn('google-blob-sprite.css', html)
self.assertNotIn('text-sprite.css', html)

View File

@ -272,7 +272,7 @@ def home_real(request: HttpRequest) -> HttpResponse:
# GOOGLE_EMOJISET for picking which spritesheet's CSS to
# include (and thus how to display emojis in the emoji picker
# and composebox typeahead).
emojiset = UserProfile.GOOGLE_EMOJISET
emojiset = UserProfile.GOOGLE_BLOB_EMOJISET
response = render(request, 'zerver/app/index.html',
context={'user_profile': user_profile,
'emojiset': emojiset,