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

Fix advanced search menu issues

Browse source 
Fix needsgutter padding of menupopup in menulist on MacOS
fix: #4052
Fix advanced search operator menu multi-select status
This commit is contained in:
windingwind 2024-04-29 11:45:09 +08:00
parent 3ec1a64a6b
commit 54382475be
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
chrome/content/zotero/elements/zoteroSearch.js
View file

@ -50,8 +50,8 @@
<label value="&zotero.search.joinMode.prefix;"/> <label value="&zotero.search.joinMode.prefix;"/>
<menulist id="joinModeMenu" oncommand="this.closest('zoterosearch').updateJoinMode();" native="true"> <menulist id="joinModeMenu" oncommand="this.closest('zoterosearch').updateJoinMode();" native="true">
<menupopup> <menupopup>
<menuitem label="&zotero.search.joinMode.any;" value="any"/> <menuitem label="&zotero.search.joinMode.any;" value="any" type="radio"/>
<menuitem label="&zotero.search.joinMode.all;" value="all" selected="true"/> <menuitem label="&zotero.search.joinMode.all;" value="all" type="radio" selected="true"/>
</menupopup> </menupopup>
</menulist> </menulist>
<label value="&zotero.search.joinMode.suffix;"/> <label value="&zotero.search.joinMode.suffix;"/>
@ -261,10 +261,11 @@
// Build operator menu // Build operator menu
for (let operator of operators) { for (let operator of operators) {
operatorsList.appendItem( let menuitem = operatorsList.appendItem(
Zotero.getString('searchOperator.' + operator), Zotero.getString('searchOperator.' + operator),
operator operator
); );
menuitem.setAttribute('type', 'radio');
} }
// Build conditions menu // Build conditions menu
@ -277,12 +278,14 @@
var menuitem = document.createXULElement('menuitem'); var menuitem = document.createXULElement('menuitem');
menuitem.setAttribute('label', condition.localized); menuitem.setAttribute('label', condition.localized);
menuitem.setAttribute('value', condition.name); menuitem.setAttribute('value', condition.name);
menuitem.setAttribute('type', 'radio');
moreConditionsMenu.before(menuitem); moreConditionsMenu.before(menuitem);
} }
else { else {
var menuitem = moreConditionsMenu.appendItem( var menuitem = moreConditionsMenu.appendItem(
condition.localized, condition.name condition.localized, condition.name
); );
menuitem.setAttribute('type', 'radio');
} }
var baseFields = null; var baseFields = null;
@ -412,6 +415,8 @@
} }
} }
operatorsList.selectedIndex = selectThis; operatorsList.selectedIndex = selectThis;
// Setting `selected` does not change `checked`. Should explicitly set it.
operatorsList.selectedItem.setAttribute('checked', true);
// Generate drop-down menu instead of textbox for certain conditions // Generate drop-down menu instead of textbox for certain conditions
switch (conditionName) { switch (conditionName) {
@ -552,6 +557,7 @@
if (row.image) { if (row.image) {
menuitem.className = 'menuitem-iconic'; menuitem.className = 'menuitem-iconic';
menuitem.setAttribute('image', row.image); menuitem.setAttribute('image', row.image);
menuitem.setAttribute('type', 'radio');
} }
} }
valueMenu.selectedIndex = 0; valueMenu.selectedIndex = 0;
@ -909,9 +915,9 @@
<html:input class="input"/> <html:input class="input"/>
<menulist class="age-list" native="true"> <menulist class="age-list" native="true">
<menupopup> <menupopup>
<menuitem label="&zotero.search.date.units.days;" value="days" selected="true"/> <menuitem label="&zotero.search.date.units.days;" value="days" type="radio" selected="true"/>
<menuitem label="&zotero.search.date.units.months;" value="months"/> <menuitem label="&zotero.search.date.units.months;" value="months" type="radio"/>
<menuitem label="&zotero.search.date.units.years;" value="years"/> <menuitem label="&zotero.search.date.units.years;" value="years" type="radio"/>
</menupopup> </menupopup>
</menulist> </menulist>
</html:div> </html:div>
@ -942,6 +948,8 @@
} }
} }
menulist.selectedIndex = selectThis; menulist.selectedIndex = selectThis;
// Setting `selected` does not change `checked`. Should explicitly set it.
menulist.selectedItem.setAttribute('checked', true);
} }
} }
customElements.define("zoterosearchagefield", ZoteroSearchAgeField); customElements.define("zoterosearchagefield", ZoteroSearchAgeField);

7
scss/mac/_menupopup.scss
View file

@ -63,6 +63,13 @@ menupopup {
} }
} }
// Overwrite menulist rules
menulist > menupopup > menuitem::after,
menulist > menupopup > menuitem::before {
content: none;
padding-inline: 0;
}
// Modified based on rules from https://searchfox.org/mozilla-esr102/source/browser/base/content/browser.css // Modified based on rules from https://searchfox.org/mozilla-esr102/source/browser/base/content/browser.css
/* On Mac, use the properties "-moz-window-transform" and "-moz-window-opacity" /* On Mac, use the properties "-moz-window-transform" and "-moz-window-opacity"