diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-07-17 17:23:28 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-17 10:23:28 +0200 |
| commit | b15f790221cdccaac04abfb9a0115823fbad883f (patch) | |
| tree | b5801f07ff0474a5f7bd8eff7b57ac431e31712f /app/javascript | |
| parent | a47c2e88909b87392f041a75d43624f14470fd71 (diff) | |
Require images in common.js (#4232)
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/main.js | 2 | ||||
| -rw-r--r-- | app/javascript/packs/common.js | 2 | ||||
| -rw-r--r-- | 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 1f8ebb721..cc422c109 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 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); |