summaryrefslogtreecommitdiff
path: root/packages/frontend/src/scripts
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-12-08 18:32:24 +0000
committerdakkar <dakkar@thenautilus.net>2024-12-08 18:32:24 +0000
commit2d304d746d26189737c363e05b689bb1e07c2abf (patch)
treec38a0f70149af27cc3edee30078b07c40f52b99b /packages/frontend/src/scripts
parentmerge: Fix avatar decoration Z index for embeds (!802) (diff)
parentAdd Flash unpreviewable file type to embeds (diff)
downloadsharkey-2d304d746d26189737c363e05b689bb1e07c2abf.tar.gz
sharkey-2d304d746d26189737c363e05b689bb1e07c2abf.tar.bz2
sharkey-2d304d746d26189737c363e05b689bb1e07c2abf.zip
merge: Feat: Flash playback using Ruffle (!687)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/687 Closes #694 Approved-by: Hazelnoot <acomputerdog@gmail.com> Approved-by: dakkar <dakkar@thenautilus.net>
Diffstat (limited to 'packages/frontend/src/scripts')
-rw-r--r--packages/frontend/src/scripts/hotkey.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/frontend/src/scripts/hotkey.ts b/packages/frontend/src/scripts/hotkey.ts
index 04fb235694..d5304ee210 100644
--- a/packages/frontend/src/scripts/hotkey.ts
+++ b/packages/frontend/src/scripts/hotkey.ts
@@ -42,7 +42,7 @@ const KEY_ALIASES = {
const MODIFIER_KEYS = ['ctrl', 'alt', 'shift'];
-const IGNORE_ELEMENTS = ['input', 'textarea'];
+const IGNORE_ELEMENTS = ['input', 'textarea', 'ruffle-player'];
//#endregion
//#region store