diff options
author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-05-09 21:50:43 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-09 14:50:43 +0200 |
commit | 42eb841dc2b217d66cf7c62108049b60eeb6d916 (patch) | |
tree | 6f96d73b9d3814855f12c40cc0fde9932843101d /app/javascript/packs/application.js | |
parent | 584b45530c9db9542221d9582be34f85240f2725 (diff) |
Remove jquery-ujs (#2939)
* Remove jquery-ujs * fix for eslint
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 cfd134a9b..247ac3922 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -1,6 +1,7 @@ import Mastodon from 'mastodon/containers/mastodon'; import React from 'react'; import ReactDOM from 'react-dom'; +import Rails from 'rails-ujs'; import 'font-awesome/css/font-awesome.css'; import '../styles/application.scss'; @@ -9,10 +10,10 @@ if (!window.Intl) { require('intl/locale-data/jsonp/en.js'); } -window.jQuery = window.$ = require('jquery'); window.Perf = require('react-addons-perf'); -require('jquery-ujs'); +Rails.start(); + require.context('../images/', true); const customContext = require.context('../../assets/stylesheets/', false); |