diff options
author | ThibG <thib@sitedethib.com> | 2018-07-17 21:54:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-17 21:54:12 +0200 |
commit | 012ca4c68d785dcf13e4cabd16b09a844e622f6b (patch) | |
tree | 106543bbde5ca7a43920ae13928d9ead0075e88b /app/javascript/packs | |
parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
parent | bcf157a1a9597595c61b1cce84bd62f63fcaa90b (diff) |
Merge pull request #578 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/packs')
-rw-r--r-- | app/javascript/packs/about.js | 3 | ||||
-rw-r--r-- | app/javascript/packs/application.js | 3 | ||||
-rw-r--r-- | app/javascript/packs/public.js | 3 | ||||
-rw-r--r-- | app/javascript/packs/share.js | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/app/javascript/packs/about.js b/app/javascript/packs/about.js index 63e12da42..843cb2c87 100644 --- a/app/javascript/packs/about.js +++ b/app/javascript/packs/about.js @@ -1,4 +1,7 @@ import loadPolyfills from '../mastodon/load_polyfills'; +import { start } from '../mastodon/common'; + +start(); function loaded() { const TimelineContainer = require('../mastodon/containers/timeline_container').default; diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 116632dea..c65ebed74 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -1,4 +1,7 @@ import loadPolyfills from '../mastodon/load_polyfills'; +import { start } from '../mastodon/common'; + +start(); loadPolyfills().then(() => { require('../mastodon/main').default(); diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js index d273231bd..0d37c34c8 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.js @@ -1,5 +1,8 @@ import loadPolyfills from '../mastodon/load_polyfills'; import ready from '../mastodon/ready'; +import { start } from '../mastodon/common'; + +start(); function main() { const IntlRelativeFormat = require('intl-relativeformat').default; diff --git a/app/javascript/packs/share.js b/app/javascript/packs/share.js index e9580f648..4ef23e1b2 100644 --- a/app/javascript/packs/share.js +++ b/app/javascript/packs/share.js @@ -1,4 +1,7 @@ import loadPolyfills from '../mastodon/load_polyfills'; +import { start } from '../mastodon/common'; + +start(); function loaded() { const ComposeContainer = require('../mastodon/containers/compose_container').default; |