diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-16 16:42:52 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-16 16:42:52 +0200 |
| commit | bcf157a1a9597595c61b1cce84bd62f63fcaa90b (patch) | |
| tree | 106543bbde5ca7a43920ae13928d9ead0075e88b /app/javascript | |
| parent | f26f1145ac0fab4a657ee1fc784e824858601bd3 (diff) | |
Avoid loading rails-ujs twice on vanilla flavour
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/core/common.js | 3 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/packs/common.js | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/javascript/core/common.js b/app/javascript/core/common.js index a7073ef0e..3b038ca40 100644 --- a/app/javascript/core/common.js +++ b/app/javascript/core/common.js @@ -1,8 +1,5 @@ // This file will be loaded on all pages, regardless of theme. -import { start } from 'rails-ujs'; import 'font-awesome/css/font-awesome.css'; require.context('../images/', true); - -start(); diff --git a/app/javascript/flavours/glitch/packs/common.js b/app/javascript/flavours/glitch/packs/common.js index 8dd4372bc..94a4e6ee4 100644 --- a/app/javascript/flavours/glitch/packs/common.js +++ b/app/javascript/flavours/glitch/packs/common.js @@ -1,3 +1,7 @@ +import { start } from 'rails-ujs'; + +start(); + import 'flavours/glitch/styles/index.scss'; // This ensures that webpack compiles our images. |