Merge branch 'fx-compat-monkey-patch-toolbarbutton' into fx102

chrome/content/scaffold/scaffold.xhtml

@@ -69,7 +69,6 @@
 
 		// Custom elements
 		Services.scriptloader.loadSubScript("chrome://global/content/customElements.js", this);
-		Services.scriptloader.loadSubScript("chrome://zotero/content/elements/menuToolbarbutton.js", this);
 	</script>
 
 	<commandset id="mainCommandSet">
@@ -353,7 +352,6 @@
 				<toolbarbutton id="tb-do" tooltiptext="&scaffold.toolbar.do.label;" oncommand="Scaffold.run('do')" class="zotero-tb-button" />
 				<toolbarseparator/>
 				<toolbarbutton
-						is="menu-toolbarbutton"
 						id="tb-template"
 						observes="code-tab-only"
 						tooltiptext="&scaffold.toolbar.template.label;"

chrome/content/zotero-platform/unix/overlay.css

@@ -8,9 +8,9 @@
 	}
 }
 
-/* Dropmarker added automatically on Linux */
+.zotero-tb-button[type="menu"] > .toolbarbutton-menu-dropmarker {
-.toolbarbutton-menu-dropmarker {
+	-moz-default-appearance: toolbarbutton-dropdown;	
-	list-style-image: none;
+	margin-left: 4px;
 }
 
 .zotero-tb-button:not([type=menu]) {

chrome/content/zotero-platform/win/overlay.css

@@ -24,6 +24,10 @@
 	}
 }
 
+.zotero-tb-button[type="menu"] > .toolbarbutton-menu-dropmarker {
+	margin-left: 4px;
+}
+
 #zotero-tb-sync-error {
 	margin-right: 4px;
 	padding-top: 4px;
@@ -151,4 +155,4 @@ tree {
 
 .zotero-view-item > tabpanel > vbox {
 	padding-left: 5px;
-}
+}

chrome/content/zotero/elements/menuToolbarbutton.js

@@ -1,60 +0,0 @@
-/*
-	***** BEGIN LICENSE BLOCK *****
-	
-	Copyright © 2022 Corporation for Digital Scholarship
-					 Vienna, Virginia, USA
-					 https://www.zotero.org
-	
-	This file is part of Zotero.
-	
-	Zotero is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	Zotero is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
-	
-	You should have received a copy of the GNU Affero General Public License
-	along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-	
-	***** END LICENSE BLOCK *****
-*/
-
-"use strict";
-
-{
-	/**
-	 * Extends MozToolbarbutton to use our own dropmarker image and native menus.
-	 */
-	class MenuToolbarbutton extends customElements.get('toolbarbutton') {
-		constructor() {
-			super();
-			this.addEventListener('mousedown', (event) => {
-				if (this.getAttribute('nonnativepopup') != 'true'
-						&& Zotero.Utilities.Internal.showNativeElementPopup(this)) {
-					event.preventDefault();
-				}
-			});
-		}
-
-		static get dropmarkerFragment() {
-			// Zotero.hiDPI[Suffix] may not have been initialized yet, so calculate it ourselves
-			let hiDPISuffix = window.devicePixelRatio > 1 ? '@2x' : '';
-			let frag = document.importNode(
-				MozXULElement.parseXULToFragment(`
-					<image src="chrome://zotero/skin/searchbar-dropmarker${hiDPISuffix}.png" width="7" height="4" class="toolbarbutton-menu-dropmarker"/>
-				`),
-				true
-			);
-			Object.defineProperty(this, "dropmarkerFragment", { value: frag });
-			return frag;
-		}
-	}
-
-	customElements.define("menu-toolbarbutton", MenuToolbarbutton, {
-		extends: "toolbarbutton",
-	});
-}

chrome/content/zotero/platformKeys.js

@@ -38,6 +38,26 @@ window.addEventListener('DOMContentLoaded', () => {
 		if (fileQuitItemUnix) fileQuitItemUnix.hidden = true;
 		if (editPreferencesSeparator) editPreferencesSeparator.hidden = true;
 		if (editPreferencesItem) editPreferencesItem.hidden = true;
+
+		// Monkey-patch the toolbarbutton CE so it shows a native menu popup
+		let MozToolbarbutton = customElements.get('toolbarbutton');
+		if (MozToolbarbutton) {
+			let originalRender = MozToolbarbutton.prototype.render;
+			MozToolbarbutton.prototype.render = function () {
+				originalRender.apply(this);
+				if (!this._zoteroMouseDownListenerAdded) {
+					this.addEventListener('mousedown', (event) => {
+						if (!event.defaultPrevented
+								&& !this.disabled
+								&& this.getAttribute('nonnativepopup') != 'true'
+								&& Zotero.Utilities.Internal.showNativeElementPopup(this)) {
+							event.preventDefault();
+						}
+					});
+					this._zoteroMouseDownListenerAdded = true;
+				}
+			};
+		}
 	}
 	else {
 		// Set behavior on all non-macOS platforms

chrome/content/zotero/zoteroPane.xhtml

@@ -86,7 +86,6 @@
 		Services.scriptloader.loadSubScript("chrome://zotero/content/elements/tagsBox.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/elements/relatedBox.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/elements/attachmentBox.js", this);
-		Services.scriptloader.loadSubScript("chrome://zotero/content/elements/menuToolbarbutton.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/elements/quickSearchTextbox.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/elements/splitMenuButton.js", this);
 
@@ -736,7 +735,6 @@
 								<hbox id="zotero-collections-toolbar" align="center">
 									<toolbarbutton id="zotero-tb-collection-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newCollection.label;" command="cmd_zotero_newCollection"/>
 									<toolbarbutton
-											is="menu-toolbarbutton"
 											id="zotero-tb-library-add-menu"
 											class="zotero-tb-button"
 											tooltiptext="&zotero.toolbar.newLibrary.label;"
@@ -758,7 +756,6 @@
 								
 								<hbox id="zotero-items-toolbar" align="center">
 									<toolbarbutton
-											is="menu-toolbarbutton"
 											id="zotero-tb-add"
 											class="zotero-tb-button"
 											tooltiptext="&zotero.toolbar.newItem.label;"
@@ -806,7 +803,6 @@
 									
 									<!--<toolbarbutton id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane_Local.newNote(event.shiftKey);"/>-->
 									<toolbarbutton
-											is="menu-toolbarbutton"
 											id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newNote;"
 											type="menu"
 											wantdropmarker="true"
@@ -817,7 +813,6 @@
 										</menupopup>
 									</toolbarbutton>
 									<toolbarbutton
-											is="menu-toolbarbutton"
 											id="zotero-tb-attachment-add"
 											class="zotero-tb-button"
 											tooltiptext="&zotero.items.menu.attach;"
@@ -843,7 +838,6 @@
 								<hbox id="zotero-item-toolbar" flex="1" align="center">
 									<hbox align="center" pack="start" flex="1">
 										<toolbarbutton
-												is="menu-toolbarbutton"
 												id="zotero-tb-locate"
 												class="zotero-tb-button"
 												tooltiptext="&zotero.toolbar.openURL.label;"

chrome/skin/default/zotero/overlay.css

@@ -237,6 +237,19 @@
 	margin-inline-end: 2px;
 }
 
+.zotero-tb-button[type="menu"] > .toolbarbutton-menu-dropmarker {
+	-moz-default-appearance: none;
+	background-image: url("chrome://zotero/skin/searchbar-dropmarker.png");
+	width: 7px;
+	height: 4px;
+	background-repeat: no-repeat;
+	background-size: 100%;
+}
+
+.zotero-tb-button[type="menu"] > .toolbarbutton-menu-dropmarker::part(icon) {
+	display: none;
+}
+
 .zotero-tb-button:hover:active {
 	mix-blend-mode: multiply;
 }
@@ -723,8 +736,7 @@
 
 /* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */
 @media (min-resolution: 1.25dppx) {
-	#zotero-items-column-hasAttachment  { list-style-image: url(chrome://zotero/skin/attach-small@2x.png); }
+	.zotero-tb-button[type="menu"] > .toolbarbutton-menu-dropmarker  { background-image: url("chrome://zotero/skin/searchbar-dropmarker@2x.png"); }
-	#zotero-items-column-numNotes  { list-style-image: url(chrome://zotero/skin/treeitem-note-small@2x.png); }
 	#zotero-tb-collection-add { list-style-image: url('chrome://zotero/skin/toolbar-collection-add@2x.png'); }
 	.zotero-menuitem-new-feed { list-style-image: url('chrome://zotero/skin/toolbar-feed-add@2x.png'); }
 	#zotero-tb-library-add-menu { list-style-image: url('chrome://zotero/skin/library_add@2x.png'); }