Archos/masto-fe-archos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bugfix] correct import of @rails/ujs / fix lint issues (#92)

Browse Source 
Details: https://github.com/rails/rails/issues/49768
Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/92
Co-authored-by: Zoë Bijl <code@moiety.me>
Co-committed-by: Zoë Bijl <code@moiety.me>
This commit is contained in:
Zoë Bijl
2025-10-10 10:54:11 +02:00
committed by Zoë Bijl
parent 4b4a9f981f
commit 496fd5987e
10 changed files with 5155 additions and 4873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
import 'packs/public-path';
import { start } from '@rails/ujs';
import Rails from '@rails/ujs';
import 'flavours/glitch/styles/index.scss';
start();
Rails.start();
// This ensures that webpack compiles our images.
require.context('../images', true);

4
app/javascript/flavours/glitch/packs/login.js
View File

@@ -1,8 +1,8 @@
import 'packs/public-path';
import { start } from '@rails/ujs';
import Rails from '@rails/ujs';
import 'flavours/glitch/styles/login.scss';
start();
Rails.start();
// This ensures that webpack compiles our images.
require.context('../images', true);

18
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 Rails from '@rails/ujs';
import axios from 'axios';
import { createBrowserHistory } from 'history';
import { throttle } from 'lodash';
@@ -143,7 +143,7 @@ function main() {
scrollToDetailedStatus();
}
delegate(document, '#user_account_attributes_username', 'input', throttle(() => {
Rails.delegate(document, '#user_account_attributes_username', 'input', throttle(() => {
const username = document.getElementById('user_account_attributes_username');
if (username.value && username.value.length > 0) {
@@ -157,7 +157,7 @@ function main() {
}
}, 500, { leading: false, trailing: true }));
delegate(document, '#user_password,#user_password_confirmation', 'input', () => {
Rails.delegate(document, '#user_password,#user_password_confirmation', 'input', () => {
const password = document.getElementById('user_password');
const confirmation = document.getElementById('user_password_confirmation');
if (!confirmation) return;
@@ -171,10 +171,10 @@ function main() {
}
});
delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
Rails.delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
Rails.delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
delegate(document, '.status__content__spoiler-link', 'click', function() {
Rails.delegate(document, '.status__content__spoiler-link', 'click', function() {
const statusEl = this.parentNode.parentNode;
if (statusEl.dataset.spoiler === 'expanded') {
@@ -210,11 +210,11 @@ function main() {
sidebar.classList.toggle('visible');
};
delegate(document, '.sidebar__toggle__icon', 'click', () => {
Rails.delegate(document, '.sidebar__toggle__icon', 'click', () => {
toggleSidebar();
});
delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
Rails.delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
if (e.key === ' ' || e.key === 'Enter') {
e.preventDefault();
toggleSidebar();
@@ -223,7 +223,7 @@ function main() {
// Empty the honeypot fields in JS in case something like an extension
// automatically filled them.
delegate(document, '#registration_new_user,#new_user', 'submit', () => {
Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
['user_website', 'user_confirm_password', 'registration_user_website', 'registration_user_confirm_password'].forEach(id => {
const field = document.getElementById(id);
if (field) {

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

@@ -1,5 +1,5 @@
import 'packs/public-path';
import { delegate } from '@rails/ujs';
import Rails from '@rails/ujs';
import loadKeyboardExtensions from 'flavours/glitch/load_keyboard_extensions';
import { loadPolyfills } from 'flavours/glitch/polyfills';
@@ -22,11 +22,11 @@ function main() {
sidebar.classList.toggle('visible');
};
delegate(document, '.sidebar__toggle__icon', 'click', () => {
Rails.delegate(document, '.sidebar__toggle__icon', 'click', () => {
toggleSidebar();
});
delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
Rails.delegate(document, '.sidebar__toggle__icon', 'keydown', e => {
if (e.key === ' ' || e.key === 'Enter') {
e.preventDefault();
toggleSidebar();