From b15f790221cdccaac04abfb9a0115823fbad883f Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Mon, 17 Jul 2017 17:23:28 +0900 Subject: Require images in common.js (#4232) --- app/javascript/packs/common.js | 2 ++ app/javascript/packs/public.js | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/javascript/packs') diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js index a0cb91ae4..ba7053f1f 100644 --- a/app/javascript/packs/common.js +++ b/app/javascript/packs/common.js @@ -4,4 +4,6 @@ import { start } from 'rails-ujs'; require('font-awesome/css/font-awesome.css'); require('mastodon-application-style'); +require.context('../images/', true); + start(); diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js index 6e6ba3476..371e0f445 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.js @@ -6,8 +6,6 @@ import { getLocale } from '../mastodon/locales'; import loadPolyfills from '../mastodon/load_polyfills'; import ready from '../mastodon/ready'; -require.context('../images/', true); - const { localeData } = getLocale(); localeData.forEach(IntlRelativeFormat.__addLocaleData); -- cgit