diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-05-16 03:20:10 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-15 20:20:10 +0200 |
| commit | 85c9496340668ad2ebd04eea57d669f82b7dbaf1 (patch) | |
| tree | e8c8ec78c00b56af36de0aec70221f4b9f323597 /app/javascript/mastodon/main.js | |
| parent | 6ee3a10f1732c6f7fd22a051c78868bf88fecdac (diff) | |
Introduce common JavaScript file (#2981)
* Create common chunk rather than vendor chunk vendor chunk is a set of modules provided by external vendors, but now we can have a chunk as a set of modules shared by multiple entry points, which could be more efficent than having vendor chunk. * Start rails-ujs in common.js This is used by /settings/two_factor_authentication.
Diffstat (limited to 'app/javascript/mastodon/main.js')
| -rw-r--r-- | app/javascript/mastodon/main.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js index 08845112b..313721c88 100644 --- a/app/javascript/mastodon/main.js +++ b/app/javascript/mastodon/main.js @@ -17,11 +17,8 @@ function main() { const Mastodon = require('mastodon/containers/mastodon').default; const React = require('react'); const ReactDOM = require('react-dom'); - const Rails = require('rails-ujs'); window.Perf = require('react-addons-perf'); - Rails.start(); - require.context('../images/', true); // import customization styles |