From 5601e100d988651e6382179a2fcef95dbe834ead Mon Sep 17 00:00:00 2001 From: djmaze Date: Wed, 10 Mar 2021 09:43:31 +0100 Subject: [PATCH] Bugfix: MouseEvent.which is not reliable --- dev/View/User/AbstractSystemDropDown.js | 2 +- dev/View/User/MailBox/MessageView.js | 3 +-- dev/dragdropgecko.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dev/View/User/AbstractSystemDropDown.js b/dev/View/User/AbstractSystemDropDown.js index 1914cb07a..b8f9cf72f 100644 --- a/dev/View/User/AbstractSystemDropDown.js +++ b/dev/View/User/AbstractSystemDropDown.js @@ -48,7 +48,7 @@ export class AbstractSystemDropDownUserView extends AbstractViewRight { } accountClick(account, event) { - if (account && event && undefined !== event.which && 1 === event.which) { + if (account && 0 === event.button) { AccountStore.accounts.loading(true); setTimeout(() => AccountStore.accounts.loading(false), 1000); } diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index 8300da570..39cb53a70 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -435,8 +435,7 @@ class MessageViewMailBoxUserView extends AbstractViewRight { let el = eqs(event, 'a'); if (el) { return !( - !!event && - 3 !== event.which && + 0 === event.button && mailToHelper( el.href, Settings.capa(Capa.Composer) ? ComposePopupView : null diff --git a/dev/dragdropgecko.js b/dev/dragdropgecko.js index dd1921a89..1dff7eee1 100644 --- a/dev/dragdropgecko.js +++ b/dev/dragdropgecko.js @@ -152,7 +152,7 @@ if (e && target) { let evt = new Event(type, {bubbles:true,cancelable:true}); evt.button = 0; - evt.which = evt.buttons = 1; + evt.buttons = 1; // copy event properties into new event ['altKey','ctrlKey','metaKey','shiftKey'].forEach(k => evt[k] = e[k]); let src = e.touches ? e.touches[0] : e;