From 763047889d4a681e8b8f8404befa7c66e5395278 Mon Sep 17 00:00:00 2001 From: itsjohncs Date: Mon, 20 Dec 2021 15:34:28 -0800 Subject: [PATCH] Remove uses of window.event. window.event is a deprecated global that's set to the currently dispatched event. - Opened and closed mentions box by clicking its icon in the top bar - Left and right clicked on an inline channel name and saw context menu open both times - Two-finger swiped on iOS and saw channel change - Long-touched and dragged channel in network list on iOS and reordered the list successfully --- .eslintrc.yml | 4 ++++ client/components/Chat.vue | 2 +- client/components/InlineChannel.vue | 2 +- client/components/NetworkList.vue | 2 +- client/js/helpers/listenForTwoFingerSwipes.js | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index d59c3b80..ffb80f5e 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -23,6 +23,10 @@ rules: no-duplicate-imports: error no-else-return: error no-implicit-globals: error + no-restricted-globals: + - error + - event + - fdescribe no-shadow: error no-template-curly-in-string: error no-unsafe-negation: error diff --git a/client/components/Chat.vue b/client/components/Chat.vue index 350ecf11..9838d1b6 100644 --- a/client/components/Chat.vue +++ b/client/components/Chat.vue @@ -227,7 +227,7 @@ export default { network: this.network, }); }, - openMentions() { + openMentions(event) { eventbus.emit("mentions:toggle", { event: event, }); diff --git a/client/components/InlineChannel.vue b/client/components/InlineChannel.vue index 2f436977..5262561d 100644 --- a/client/components/InlineChannel.vue +++ b/client/components/InlineChannel.vue @@ -19,7 +19,7 @@ export default { channel: String, }, methods: { - openContextMenu() { + openContextMenu(event) { eventbus.emit("contextmenu:inline-channel", { event: event, channel: this.channel, diff --git a/client/components/NetworkList.vue b/client/components/NetworkList.vue index ea1aef6b..4cd2fe11 100644 --- a/client/components/NetworkList.vue +++ b/client/components/NetworkList.vue @@ -348,7 +348,7 @@ export default { event.item.classList.remove("ui-sortable-dragging-touch-cue"); this.startDrag = null; }, - onDraggableTouchStart() { + onDraggableTouchStart(event) { if (event.touches.length === 1) { // This prevents an iOS long touch default behavior: selecting // the nearest selectable text. diff --git a/client/js/helpers/listenForTwoFingerSwipes.js b/client/js/helpers/listenForTwoFingerSwipes.js index 8689f083..048b4188 100644 --- a/client/js/helpers/listenForTwoFingerSwipes.js +++ b/client/js/helpers/listenForTwoFingerSwipes.js @@ -39,7 +39,7 @@ function listenForTwoFingerSwipes(onTwoFingerSwipe) { document.body.addEventListener( "touchend", - function () { + function (event) { if (event.touches.length >= 2) { return; }