Skip to content

Commit

Permalink
Merge pull request #1638 from fey/fix-ujs
Browse files Browse the repository at this point in the history
fix ujs
  • Loading branch information
fey authored Jun 15, 2024
2 parents 965071d + b7b7421 commit 1824618
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
23 changes: 11 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"@codemirror/state": "^6.3.3",
"@codemirror/view": "^6.22.2",
"@popperjs/core": "^2.11.8",
"@rails/ujs": "^7.1.3-4",
"@reduxjs/toolkit": "^2.0.1",
"axios": "^1.6",
"bootstrap": "^5.3.2",
Expand All @@ -29,7 +30,6 @@
"highlight.js": "^11.x",
"i18next": "^23.7.8",
"jquery": "^3.7.1",
"jquery-ujs": "^1.2.3",
"lodash": "^4.17.21",
"react": "^18.2.0",
"react-bootstrap": "^2.9.1",
Expand Down
4 changes: 2 additions & 2 deletions resources/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import $ from 'jquery';
import lodash from 'lodash';
import * as bootstrap from 'bootstrap';
import axios from 'axios';
import ujs from '@rails/ujs';
import correctionListener from './correction';

import 'jquery-ujs';

import.meta.glob([
'../assets/images/**',
]);
Expand All @@ -16,5 +15,6 @@ window.jQuery = $;
window._ = lodash;
window.axios = axios;
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
ujs.start();

correctionListener();

0 comments on commit 1824618

Please sign in to comment.