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

Fix empty Quick Copy locale dropdown (without a freeze) (#3720)

Browse source
This commit is contained in:
Abe Jellinek 2024-02-21 06:42:59 -05:00 • committed by GitHub
parent 35a324b65b
commit 130a72af1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

32
chrome/content/zotero/preferences/preferences.js
View file

@ -31,6 +31,8 @@ var Zotero_Preferences = {
_firstPaneLoadDeferred: Zotero.Promise.defer(),
_observerSymbols: new Map(),
_mutationObservers: new Map(),
init: function () {
this.navigation = document.getElementById('prefs-navigation');
@ -442,14 +444,29 @@ ${str}
this._observerSymbols.set(elem, symbol);
if (elem.tagName === 'menulist') {
// Set up an observer to resync if this menulist has items added/removed later
// Set up an observer to resync if this menulist has items added later
// (If we set elem.value before the corresponding item is added, the label won't be updated when it
// does get added, unless we do this)
new MutationObserver(() => this._syncFromPref(elem, preference))
.observe(elem, {
childList: true,
subtree: true
});
let mutationObserver = new MutationObserver((mutations) => {
let value = Zotero.Prefs.get(preference, true);
for (let mutation of mutations) {
for (let node of mutation.addedNodes) {
if (node.tagName === 'menuitem' && node.value === value) {
Zotero.debug(`Preferences: menulist attached to ${preference} has new item matching current pref value '${value}'`);
// Set selectedItem so the menulist updates its label, icon, and description
// The selectedItem setter fires select and ValueChange, but we don't listen to either
// of those events
elem.selectedItem = node;
return;
}
}
}
});
mutationObserver.observe(elem, {
childList: true,
subtree: true
});
this._mutationObservers.set(elem, mutationObserver);
}
elem.addEventListener('command', this._syncToPrefOnModify.bind(this));
@ -468,6 +485,9 @@ ${str}
Zotero.Prefs.unregisterObserver(this._observerSymbols.get(elem));
this._observerSymbols.delete(elem);
}
if (this._mutationObservers.has(elem)) {
this._mutationObservers.get(elem).disconnect();
}
};
let awaitBeforeShowing = [];

7
chrome/content/zotero/preferences/preferences_export.jsx
View file

@ -69,11 +69,12 @@ Zotero_Preferences.Export = {
// Initialize locale drop-down
var localeMenulist = document.getElementById("zotero-quickCopy-locale-menu");
Zotero.Styles.populateLocaleList(localeMenulist);
localeMenulist.addEventListener('syncfrompreference', () => {
this._lastSelectedLocale = Zotero.Prefs.get("export.quickCopy.locale");
this.updateQuickCopyUI();
});
localeMenulist.setAttribute('preference', "extensions.zotero.export.quickCopy.locale");
this._lastSelectedLocale = Zotero.Prefs.get("export.quickCopy.locale");
this.updateQuickCopyUI();
yield this.refreshQuickCopySiteList();
}),