LenPayne/mastodon
1
0
Fork 0
forked from cybrespace/mastodon
Code Issues Pull requests Releases Wiki Activity

Require images in common.js (#4232)

Browse source
This commit is contained in:
Akihiko Odaki 2017-07-17 17:23:28 +09:00 • committed by Eugen Rochko
parent a47c2e8890
commit b15f790221
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/main.js
View file

@ -8,8 +8,6 @@ function main() {
const React = require('react'); const React = require('react');
const ReactDOM = require('react-dom'); const ReactDOM = require('react-dom');
require.context('../images/', true);
if (window.history && history.replaceState) { if (window.history && history.replaceState) {
const { pathname, search, hash } = window.location; const { pathname, search, hash } = window.location;
const path = pathname + search + hash; const path = pathname + search + hash;

2
app/javascript/packs/common.js
View file

@ -4,4 +4,6 @@ import { start } from 'rails-ujs';
require('font-awesome/css/font-awesome.css'); require('font-awesome/css/font-awesome.css');
require('mastodon-application-style'); require('mastodon-application-style');
require.context('../images/', true);
start(); start();

2
app/javascript/packs/public.js
View file

@ -6,8 +6,6 @@ import { getLocale } from '../mastodon/locales';
import loadPolyfills from '../mastodon/load_polyfills'; import loadPolyfills from '../mastodon/load_polyfills';
import ready from '../mastodon/ready'; import ready from '../mastodon/ready';
require.context('../images/', true);
const { localeData } = getLocale(); const { localeData } = getLocale();
localeData.forEach(IntlRelativeFormat.__addLocaleData); localeData.forEach(IntlRelativeFormat.__addLocaleData);