From 56cef1d5040fc44fe0225feebdc10b391d5e43ef Mon Sep 17 00:00:00 2001
From: windingwind <33902321+windingwind@users.noreply.github.com>
Date: Fri, 5 Jan 2024 09:18:46 +0800
Subject: [PATCH] Fix advancedSearch menu

---
 chrome/content/zotero/advancedSearch.xhtml     | 2 +-
 chrome/content/zotero/customElements.js        | 2 +-
 chrome/content/zotero/elements/zoteroSearch.js | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/advancedSearch.xhtml b/chrome/content/zotero/advancedSearch.xhtml
index cc36fe828a..ec61dd7ba4 100644
--- a/chrome/content/zotero/advancedSearch.xhtml
+++ b/chrome/content/zotero/advancedSearch.xhtml
@@ -26,10 +26,10 @@
 
 	<script>
 		var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-		Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
 	</script>
 	
 	<script src="include.js"/>
+	<script src="customElements.js"/>
 	<script src="advancedSearch.js"/>
 
 	<popupset>
diff --git a/chrome/content/zotero/customElements.js b/chrome/content/zotero/customElements.js
index f1eeb00547..acad6b7922 100644
--- a/chrome/content/zotero/customElements.js
+++ b/chrome/content/zotero/customElements.js
@@ -107,7 +107,7 @@ Services.scriptloader.loadSubScript('chrome://zotero/content/elements/librariesC
 					}
 					// Following the implementation from https://searchfox.org/mozilla-esr102/source/toolkit/content/widgets/menupopup.js
 					let haveCheckableChild = this.querySelector(
-						":scope > menuitem:not([hidden]):is([type=checkbox],[type=radio])"
+						":scope > menuitem:not([hidden]):is([type=checkbox],[type=radio],[selected],[checked])"
 					);
 					this.toggleAttribute("needsgutter", haveCheckableChild);
 					// Update animate attribute when the popup is shown
diff --git a/chrome/content/zotero/elements/zoteroSearch.js b/chrome/content/zotero/elements/zoteroSearch.js
index 46757ac7e9..f3d61eed7e 100644
--- a/chrome/content/zotero/elements/zoteroSearch.js
+++ b/chrome/content/zotero/elements/zoteroSearch.js
@@ -405,7 +405,7 @@
 			{
 				var val = operatorsList.firstChild.childNodes[i].getAttribute('value');
 				var hidden = !operators[val];
-				operatorsList.firstChild.childNodes[i].setAttribute('hidden', hidden);
+				operatorsList.firstChild.childNodes[i].toggleAttribute('hidden', hidden);
 				if (!hidden && (selectThis == null || this.selectedOperator == val))
 				{
 					selectThis = i;
@@ -836,7 +836,7 @@
 				case 'fulltextContent':
 					var menu = this.querySelector('#textbox-fulltext-menu');
 					this.setAttribute('hasOptions', true);
-					button.setAttribute('hidden', false);
+					button.removeAttribute('hidden');
 					
 					var selectedIndex = 0;
 					if (mode){