mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix split-menu-button dropmarker triggering the button click event

Browse source 
Regression in fa31956d
This commit is contained in:
Adomas Venčkauskas 2023-07-25 14:22:57 +03:00
parent 630c6d0d97
commit d96afa4499
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
chrome/content/zotero/elements/splitMenuButton.js
View file

@ -41,10 +41,8 @@
// Pointer events don't reach the button's children, so check mousedown positions manually and open
// the popup if over the end side of the button
this.addEventListener('mousedown', (event) => {
let rect = this.querySelector('[anonid="dropmarker-box"]').getBoundingClientRect();
if ((!Zotero.rtl && event.clientX >= rect.left || Zotero.rtl && event.clientX <= rect.right)
&& Zotero.Utilities.Internal.showNativeElementPopup(this)) {
event.preventDefault();
if (this._isEventInDropmarkerBox(event)) {
Zotero.Utilities.Internal.showNativeElementPopup(this);
}
});
@ -57,6 +55,20 @@
connectedCallback() {
this.append(this.constructor.contentFragment);
// Prevent DOM-attached mouse handlers from running in the dropmarker area
for (const eventType of ['mousedown', 'mouseup', 'click']) {
const handler = this.getAttribute('on' + eventType);
if (!handler) {
continue;
}
this['on' + eventType] = null;
this.addEventListener(eventType, (event) => {
if (!this._isEventInDropmarkerBox(event)) {
eval(handler).bind(this);
}
});
}
}
get image() {
@ -94,6 +106,11 @@
Object.defineProperty(this, "dropmarkerFragment", { value: frag });
return frag;
}
_isEventInDropmarkerBox(event) {
let rect = this.querySelector('[anonid="dropmarker-box"]').getBoundingClientRect();
return !Zotero.rtl && event.clientX >= rect.left || Zotero.rtl && event.clientX <= rect.right
}
}
customElements.define("split-menu-button", SplitMenuButton, {