From 0c3ce41031d292734e0e4cc70d227228d1993bea Mon Sep 17 00:00:00 2001 From: "Renato \"Lond\" Cerqueira" Date: Thu, 7 Jun 2018 19:40:23 +0200 Subject: Update to emojimart 2.6.1 (#7746) * Update to emojimart 2.6.1 WIP using local updated version. Sheet comes from emoji-data@4.0.4, file sheet_twitter_32_indexed_256.png. * Update to 2.6.1 and uncompress data if needed * Remove changes that were not needed * Fix yarn lock file * Match emojiToShowFilter behavior to new version of emoji-mart * Fix codeclimate issue * Match custom emoji behavior to new version of emoji-mart * Replace emoji without shortcode in tests * Fix code climate issues --- public/emoji/sheet.png | Bin 3071758 -> 858920 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'public') diff --git a/public/emoji/sheet.png b/public/emoji/sheet.png index e9a3f23f8..3ee92a1f1 100644 Binary files a/public/emoji/sheet.png and b/public/emoji/sheet.png differ -- cgit From 268d90e8103770e8b90f6d5680a466c1ec83c6ff Mon Sep 17 00:00:00 2001 From: "Renato \"Lond\" Cerqueira" Date: Sun, 10 Jun 2018 16:12:47 +0200 Subject: Rename emoji sheet to avoid caching issue (#7777) --- .../compose/components/emoji_picker_dropdown.js | 2 +- config/webpack/production.js | 2 +- public/emoji/sheet.png | Bin 858920 -> 0 bytes public/emoji/sheet_10.png | Bin 0 -> 858920 bytes 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 public/emoji/sheet.png create mode 100644 public/emoji/sheet_10.png (limited to 'public') 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.png deleted file mode 100644 index 3ee92a1f1..000000000 Binary files a/public/emoji/sheet.png and /dev/null differ diff --git a/public/emoji/sheet_10.png b/public/emoji/sheet_10.png new file mode 100644 index 000000000..3ee92a1f1 Binary files /dev/null and b/public/emoji/sheet_10.png differ -- cgit