diff options
author | ThibG <thib@sitedethib.com> | 2020-10-13 01:19:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-13 01:19:35 +0200 |
commit | 4c45b43cb8a3d902c130729d36d559ec9de23d3e (patch) | |
tree | ee915a79950dbad38d515a8870a30e40480bff5e /app/javascript/mastodon/features/emoji/emoji.js | |
parent | 53b22d247fb8500ea977774d727fe0d41950189c (diff) |
Change how CDN_HOST is passed down to make assets build reproducible (#14381)
* Change how CDN_HOST is passed down to make assets build reproducible * Change webpacker/webpack configuration to dynamically load publicPath based on meta header * Fix embedded layout missing the cdn-host meta header
Diffstat (limited to 'app/javascript/mastodon/features/emoji/emoji.js')
-rw-r--r-- | app/javascript/mastodon/features/emoji/emoji.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js index 5d9dad097..4e37f3a80 100644 --- a/app/javascript/mastodon/features/emoji/emoji.js +++ b/app/javascript/mastodon/features/emoji/emoji.js @@ -1,11 +1,10 @@ import { autoPlayGif } from '../../initial_state'; import unicodeMapping from './emoji_unicode_mapping_light'; +import { assetHost } from 'mastodon/utils/config'; import Trie from 'substring-trie'; const trie = new Trie(Object.keys(unicodeMapping)); -const assetHost = process.env.CDN_HOST || ''; - // Convert to file names from emojis. (For different variation selector emojis) const emojiFilenames = (emojis) => { return emojis.map(v => unicodeMapping[v].filename); |