diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
| commit | d69fa9e1f40124279ec9d772e5f54d1e11724e2d (patch) | |
| tree | ef0462e5fcc8cc7962ef42d80f7dd520a574a7c5 /app/javascript/packs/application.js | |
| parent | c727eae4412ac9e4f1bafdc68fe89dcd46d602ca (diff) | |
| parent | 0b4006fc47dcd3d57ffdd0b95c95ad4c40a4918f (diff) | |
Merge changes from upstream with the CSS reload fix
Diffstat (limited to 'app/javascript/packs/application.js')
| -rw-r--r-- | app/javascript/packs/application.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 63c5d6272..116632dea 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -1,6 +1,7 @@ -import main from '../mastodon/main'; import loadPolyfills from '../mastodon/load_polyfills'; -loadPolyfills().then(main).catch(e => { +loadPolyfills().then(() => { + require('../mastodon/main').default(); +}).catch(e => { console.error(e); }); |