From b15f790221cdccaac04abfb9a0115823fbad883f Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Mon, 17 Jul 2017 17:23:28 +0900
Subject: [PATCH] Require images in common.js (#4232)
---
app/javascript/mastodon/main.js | 2 --
app/javascript/packs/common.js | 2 ++
app/javascript/packs/public.js | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index 1f8ebb72145..cc422c10991 100644
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -8,8 +8,6 @@ function main() {
const React = require('react');
const ReactDOM = require('react-dom');
- require.context('../images/', true);
-
if (window.history && history.replaceState) {
const { pathname, search, hash } = window.location;
const path = pathname + search + hash;
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
index a0cb91ae4b9..ba7053f1fcb 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 6e6ba34769f..371e0f44533 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);