Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream

Browse Source 
Conflicts and ported changes:
- updated `@rails/ujs` imports
This commit is contained in:
Claire
2023-10-24 19:59:19 +02:00
parent e25cc4deb7 e93a75f1a1
commit 4b0fb764c3
17 changed files with 126 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/core/admin.js
View File

@@ -1,7 +1,7 @@
// This file will be loaded on admin pages, regardless of theme.
import 'packs/public-path';
import { delegate } from '@rails/ujs';
import delegate from '@rails/ujs';
import ready from '../mastodon/ready';

2
app/javascript/core/settings.js
View File

@@ -1,7 +1,7 @@
// This file will be loaded on settings pages, regardless of theme.
import 'packs/public-path';
import { delegate } from '@rails/ujs';
import delegate from '@rails/ujs';
delegate(document, '#edit_profile input[type=file]', 'change', ({ target }) => {
const avatar = document.getElementById(target.id + '-preview');

2
app/javascript/flavours/glitch/packs/common.js
View File

@@ -1,5 +1,5 @@
import 'packs/public-path';
import { start } from '@rails/ujs';
import start from '@rails/ujs';
import 'flavours/glitch/styles/index.scss';
start();

2
app/javascript/flavours/glitch/packs/public.jsx
View File

@@ -4,7 +4,7 @@ import { createRoot } from 'react-dom/client';
import { IntlMessageFormat } from 'intl-messageformat';
import { defineMessages } from 'react-intl';
import { delegate } from '@rails/ujs';
import delegate from '@rails/ujs';
import axios from 'axios';
import { createBrowserHistory } from 'history';
import { throttle } from 'lodash';

2
app/javascript/flavours/glitch/packs/settings.js
View File

@@ -1,5 +1,5 @@
import 'packs/public-path';
import { delegate } from '@rails/ujs';
import delegate from '@rails/ujs';
import loadKeyboardExtensions from 'flavours/glitch/load_keyboard_extensions';
import { loadPolyfills } from 'flavours/glitch/polyfills';

2
app/javascript/packs/public.jsx
View File

@@ -5,7 +5,7 @@ import { createRoot } from 'react-dom/client';
import { IntlMessageFormat } from 'intl-messageformat';
import { defineMessages } from 'react-intl';
import { delegate } from '@rails/ujs';
import delegate from '@rails/ujs';
import axios from 'axios';
import { throttle } from 'lodash';