hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename emoji sheet to avoid caching issue (#7777)

signup-info-prompt
Renato "Lond" Cerqueira 2018-06-10 16:12:47 +02:00 committed by Eugen Rochko
parent 35ae960122
commit 268d90e810
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
View File

@ -28,7 +28,7 @@ const messages = defineMessages({
const assetHost = process.env.CDN_HOST || ''; const assetHost = process.env.CDN_HOST || '';
let EmojiPicker, Emoji; // load asynchronously 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 listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : false;
const categoriesSort = [ const categoriesSort = [

2
config/webpack/production.js
View File

@ -92,7 +92,7 @@ module.exports = merge(sharedConfig, {
}, },
externals: [ externals: [
'/emoji/1f602.svg', // used for emoji picker dropdown '/emoji/1f602.svg', // used for emoji picker dropdown
'/emoji/sheet.png', // used in emoji-mart '/emoji/sheet_10.png', // used in emoji-mart
], ],
excludes: [ excludes: [
'**/*.gz', '**/*.gz',

0
public/emoji/sheet.png → public/emoji/sheet_10.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 839 KiB

After

Width:  |  Height:  |  Size: 839 KiB