diff options
| author | Renato "Lond" Cerqueira <renato@lond.com.br> | 2018-06-10 16:12:47 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-06-10 16:12:47 +0200 |
| commit | 268d90e8103770e8b90f6d5680a466c1ec83c6ff (patch) | |
| tree | c9c978fa64978a95dada123057750dbf06b2f8f9 | |
| parent | 35ae9601228fcc91eadcea6f486097eea4275873 (diff) | |
Rename emoji sheet to avoid caching issue (#7777)
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js | 2 | ||||
| -rw-r--r-- | config/webpack/production.js | 2 | ||||
| -rw-r--r-- | public/emoji/sheet_10.png (renamed from public/emoji/sheet.png) | bin | 858920 -> 858920 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js index 84665a7e8..4fc32db8a 100644 --- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js @@ -28,7 +28,7 @@ const messages = defineMessages({ const assetHost = process.env.CDN_HOST || ''; let EmojiPicker, Emoji; // load asynchronously -const backgroundImageFn = () => `${assetHost}/emoji/sheet.png`; +const backgroundImageFn = () => `${assetHost}/emoji/sheet_10.png`; const listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : false; const categoriesSort = [ diff --git a/config/webpack/production.js b/config/webpack/production.js index 1469a948f..037a76a59 100644 --- a/config/webpack/production.js +++ b/config/webpack/production.js @@ -92,7 +92,7 @@ module.exports = merge(sharedConfig, { }, externals: [ '/emoji/1f602.svg', // used for emoji picker dropdown - '/emoji/sheet.png', // used in emoji-mart + '/emoji/sheet_10.png', // used in emoji-mart ], excludes: [ '**/*.gz', diff --git a/public/emoji/sheet.png b/public/emoji/sheet_10.png index 3ee92a1f1..3ee92a1f1 100644 --- a/public/emoji/sheet.png +++ b/public/emoji/sheet_10.png Binary files differ |
