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

Improve merge pane (#4200)

Browse source 
resolve: #4142
This commit is contained in:
windingwind 2024-06-07 12:37:54 +08:00 • committed by GitHub
parent c826805bca
commit 5cc6631fd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
chrome/content/zotero/elements/duplicatesMergePane.js
View file

@ -37,12 +37,13 @@
</hbox> </hbox>
</groupbox> </groupbox>
<groupbox flex="1"> <groupbox id="zotero-duplicates-merge-field-select">
<description id="zotero-duplicates-merge-field-select">&zotero.duplicatesMerge.fieldSelect;</description> <description>&zotero.duplicatesMerge.fieldSelect;</description>
<vbox id="zotero-duplicates-merge-item-box-container" flex="1">
<item-box id="zotero-duplicates-merge-item-box" flex="1"/>
</vbox>
</groupbox> </groupbox>
<vbox id="zotero-duplicates-merge-item-box-container">
<item-box id="zotero-duplicates-merge-item-box"/>
</vbox>
`, ['chrome://zotero/locale/zotero.dtd']); `, ['chrome://zotero/locale/zotero.dtd']);
init() { init() {

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

@ -669,15 +669,15 @@
this.addDynamicRow(rowLabel, rowData); this.addDynamicRow(rowLabel, rowData);
let button, popup;
// In field merge mode, add a button to switch field versions // In field merge mode, add a button to switch field versions
if (this.mode == 'fieldmerge' && typeof this._fieldAlternatives[fieldName] != 'undefined') { if (this.mode == 'fieldmerge' && typeof this._fieldAlternatives[fieldName] != 'undefined') {
var button = document.createXULElement("toolbarbutton"); button = document.createXULElement("toolbarbutton");
button.className = 'zotero-field-version-button zotero-clicky-merge'; button.className = 'zotero-field-version-button zotero-clicky-merge';
button.setAttribute('type', 'menu');
let fieldLocalName = rowLabel.querySelector("label")?.textContent; let fieldLocalName = rowLabel.querySelector("label")?.textContent;
document.l10n.setAttributes(button, 'itembox-button-merge', { field: fieldLocalName || "" }); document.l10n.setAttributes(button, 'itembox-button-merge', { field: fieldLocalName || "" });
var popup = button.appendChild(document.createXULElement("menupopup")); popup = button.appendChild(document.createXULElement("menupopup"));
for (let v of this._fieldAlternatives[fieldName]) { for (let v of this._fieldAlternatives[fieldName]) {
let menuitem = document.createXULElement("menuitem"); let menuitem = document.createXULElement("menuitem");
@ -697,6 +697,10 @@
}); });
popup.appendChild(menuitem); popup.appendChild(menuitem);
} }
button.addEventListener("click", (e) => {
this.handlePopupOpening(e, popup);
});
rowData.appendChild(button); rowData.appendChild(button);
} }

1
chrome/content/zotero/elements/itemPane.js
View file

@ -552,6 +552,7 @@
} }
case "duplicates": { case "duplicates": {
this._deck.selectedIndex = 3; this._deck.selectedIndex = 3;
this.removeAttribute("collapsed");
break; break;
} }
} }

10
scss/elements/_duplicatesMergePane.scss
View file

@ -3,6 +3,7 @@ duplicates-merge-pane {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 8px; gap: 8px;
scrollbar-color: var(--color-scrollbar) var(--color-scrollbar-background);
} }
padding-top: 9px; padding-top: 9px;
@ -19,15 +20,14 @@ duplicates-merge-pane {
} }
} }
#zotero-duplicates-merge-field-select {
margin-bottom: 9px;
}
#zotero-duplicates-merge-item-box-container { #zotero-duplicates-merge-item-box-container {
flex: 1; flex: 1;
padding-inline: 8px; padding-inline: 8px;
overflow-y: scroll; overflow-y: scroll;
border-top: var(--material-border-quinary);
#zotero-duplicates-merge-item-box {
border-top: var(--material-border-quinary);
}
collapsible-section > .head { collapsible-section > .head {
display: none; display: none;