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

fx-compat: Fix Duplicate Items merge view

Browse source
This commit is contained in:
Abe Jellinek 2022-05-31 14:57:47 -07:00
parent 59d5013952
commit d3555228b2
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
chrome/content/zotero-platform/mac/itemPane.css
View file

@ -7,3 +7,10 @@
margin: 0; margin: 0;
-moz-appearance: none; -moz-appearance: none;
} }
/* Show duplicates date list item as selected even when not focused
(default behavior on other platforms) */
#zotero-duplicates-merge-original-date:not(:focus) > richlistitem[selected="true"] {
background-color: -moz-cellhighlight;
color: -moz-cellhighlighttext;
}

10
chrome/content/zotero/elements/itemBox.js
View file

@ -448,11 +448,11 @@
} }
if (this.showTypeMenu) { if (this.showTypeMenu) {
this.updateItemTypeMenuSelection(); this.updateItemTypeMenuSelection();
this.itemTypeMenu.parentNode.hidden = false; this.itemTypeMenu.parentNode.parentNode.style.display = 'initial';
this.itemTypeMenu.setAttribute('ztabindex', '0'); this.itemTypeMenu.setAttribute('ztabindex', '0');
} }
else { else {
this.itemTypeMenu.parentNode.hidden = true; this.itemTypeMenu.parentNode.parentNode.style.display = 'none';
} }
// //
@ -630,7 +630,7 @@
var popup = button.appendChild(document.createXULElement("menupopup")); var popup = button.appendChild(document.createXULElement("menupopup"));
for (let v of this._fieldAlternatives[fieldName]) { for (let v of this._fieldAlternatives[fieldName]) {
var menuitem = document.createXULElement("menuitem"); let menuitem = document.createXULElement("menuitem");
var sv = Zotero.Utilities.ellipsize(v, 60); var sv = Zotero.Utilities.ellipsize(v, 60);
menuitem.setAttribute('label', sv); menuitem.setAttribute('label', sv);
if (v != sv) { if (v != sv) {
@ -638,13 +638,13 @@
} }
menuitem.setAttribute('fieldName', fieldName); menuitem.setAttribute('fieldName', fieldName);
menuitem.setAttribute('originalValue', v); menuitem.setAttribute('originalValue', v);
menuitem.oncommand = () => { menuitem.addEventListener('command', () => {
this.item.setField( this.item.setField(
menuitem.getAttribute('fieldName'), menuitem.getAttribute('fieldName'),
menuitem.getAttribute('originalValue') menuitem.getAttribute('originalValue')
); );
this.refresh(); this.refresh();
}; });
popup.appendChild(menuitem); popup.appendChild(menuitem);
} }

4
chrome/content/zotero/zoteroPane.xhtml
View file

@ -1157,13 +1157,13 @@
<groupbox id="zotero-duplicates-merge-version-select"> <groupbox id="zotero-duplicates-merge-version-select">
<description>&zotero.duplicatesMerge.versionSelect;</description> <description>&zotero.duplicatesMerge.versionSelect;</description>
<hbox> <hbox>
<listbox id="zotero-duplicates-merge-original-date" onselect="Zotero_Duplicates_Pane.setMaster(this.selectedIndex)" rows="0"/> <richlistbox id="zotero-duplicates-merge-original-date" onselect="Zotero_Duplicates_Pane.setMaster(this.selectedIndex)" rows="0"/>
</hbox> </hbox>
</groupbox> </groupbox>
<groupbox flex="1"> <groupbox flex="1">
<description id="zotero-duplicates-merge-field-select">&zotero.duplicatesMerge.fieldSelect;</description> <description id="zotero-duplicates-merge-field-select">&zotero.duplicatesMerge.fieldSelect;</description>
<zoteroitembox id="zotero-duplicates-merge-item-box" flex="1"/> <item-box id="zotero-duplicates-merge-item-box" flex="1"/>
</groupbox> </groupbox>
</vbox> </vbox>
</deck> </deck>