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

Revert menulist type=radio

Browse source 
Partially revert 5438247, 63012a8 because the menulist style is fixed by 4a0bb2d in SCSS
See also #4052
This commit is contained in:
windingwind 2024-05-17 17:23:22 +08:00
parent f6ee160186
commit 126d12905b
2 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
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" type="radio"/> <menuitem label="&zotero.search.joinMode.any;" value="any"/>
<menuitem label="&zotero.search.joinMode.all;" value="all" type="radio" selected="true"/> <menuitem label="&zotero.search.joinMode.all;" value="all" selected="true"/>
</menupopup> </menupopup>
</menulist> </menulist>
<label value="&zotero.search.joinMode.suffix;"/> <label value="&zotero.search.joinMode.suffix;"/>
@ -261,11 +261,10 @@
// Build operator menu // Build operator menu
for (let operator of operators) { for (let operator of operators) {
let menuitem = operatorsList.appendItem( operatorsList.appendItem(
Zotero.getString('searchOperator.' + operator), Zotero.getString('searchOperator.' + operator),
operator operator
); );
menuitem.setAttribute('type', 'radio');
} }
// Build conditions menu // Build conditions menu
@ -274,18 +273,17 @@
var conditions = Zotero.SearchConditions.getStandardConditions(); var conditions = Zotero.SearchConditions.getStandardConditions();
for (let condition of conditions) { for (let condition of conditions) {
let menuitem;
if (this.isPrimaryCondition(condition.name)) { if (this.isPrimaryCondition(condition.name)) {
var menuitem = document.createXULElement('menuitem'); 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( menuitem = moreConditionsMenu.appendItem(
condition.localized, condition.name condition.localized, condition.name
); );
menuitem.setAttribute('type', 'radio');
} }
var baseFields = null; var baseFields = null;
@ -554,7 +552,6 @@
for (let row of rows) { for (let row of rows) {
let menuitem = valueMenu.appendItem(row.name, row.value); let menuitem = valueMenu.appendItem(row.name, row.value);
menuitem.setAttribute('type', 'radio');
if (row.image) { if (row.image) {
menuitem.className = 'menuitem-iconic'; menuitem.className = 'menuitem-iconic';
menuitem.setAttribute('image', row.image); menuitem.setAttribute('image', row.image);
@ -915,9 +912,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" type="radio" selected="true"/> <menuitem label="&zotero.search.date.units.days;" value="days" selected="true"/>
<menuitem label="&zotero.search.date.units.months;" value="months" type="radio"/> <menuitem label="&zotero.search.date.units.months;" value="months"/>
<menuitem label="&zotero.search.date.units.years;" value="years" type="radio"/> <menuitem label="&zotero.search.date.units.years;" value="years"/>
</menupopup> </menupopup>
</menulist> </menulist>
</html:div> </html:div>

1
chrome/content/zotero/xpcom/utilities_internal.js
View file

@ -1558,7 +1558,6 @@ Zotero.Utilities.Internal = {
let menuitem = menulist.ownerDocument.createXULElement('menuitem'); let menuitem = menulist.ownerDocument.createXULElement('menuitem');
menuitem.value = library.libraryID; menuitem.value = library.libraryID;
menuitem.setAttribute('label', library.name); menuitem.setAttribute('label', library.name);
menuitem.setAttribute('type', 'radio');
menuitem.setAttribute('data-editable', library.editable ? 'true' : 'false'); menuitem.setAttribute('data-editable', library.editable ? 'true' : 'false');
menuitem.setAttribute('data-filesEditable', library.filesEditable ? 'true' : 'false'); menuitem.setAttribute('data-filesEditable', library.filesEditable ? 'true' : 'false');
menupopup.appendChild(menuitem); menupopup.appendChild(menuitem);