scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-28 01:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

citation dialog: fix IO race condition on load (#5097)

Browse source 
IOManager relies on everything being loaded, so it
should be initialized last. Otherwise, any IO handler
trying to access currentLayout would throw an error.

Also, swap the order of operations in bubble-input to
set input width only after the first input is added.
Otherwise, first input will have an arbitrary width
during initial load.

https://forums.zotero.org/discussion/122554/beta-new-insertion-bar-problem-with-citations-but-not-notes
This commit is contained in:
abaevbog 2025-03-11 21:48:40 -07:00 • committed by GitHub
parent 011c5bd6c0
commit cb53c6eb2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -100,16 +100,16 @@
bubble.classList.toggle("has-item-selected", !!itemObj.selected);
}
}
// Make sure that all inputs occupy the right width
for (let input of [...this.querySelectorAll(".input")]) {
let requiredWidth = Utils.getContentWidth(input);
input.style.width = `${requiredWidth}px`;
}
// Prepend first input
if (!this._body.firstChild || !Utils.isInput(this._body.firstChild)) {
let input = this._createInputElem();
this._body.prepend(input);
}
// Make sure that all inputs occupy the right width
for (let input of [...this.querySelectorAll(".input")]) {
let requiredWidth = Utils.getContentWidth(input);
input.style.width = `${requiredWidth}px`;
}
// Add placeholder and a special aria-description to the first input when there are no bubbles
let isOnlyInput = this.getAllBubbles().length == 0;
this._body.firstChild.classList.toggle("full-width", isOnlyInput);

10
chrome/content/zotero/integration/citationDialog.js
View file

@ -74,9 +74,6 @@ async function onLoad() {
// keypress from the top-most row in the items table
doc.addEventListener("keydown", event => KeyboardHandler.captureKeydown(event), true);
// handling of user's IO
IOManager.init();
// Move dialog towards the center (it's needed even though we open the dialog with centerscreen param)
let targetX = Math.floor((window.screen.width - window.outerWidth) / 2);
let targetY = window.screen.height / 3;
@ -93,8 +90,13 @@ async function onLoad() {
// fetch opened/selected/cited items so they are known
// before refreshing items list after dialog mode setting
await SearchHandler.refreshNonLibraryItems();
// set initial dialog mode when everything is loaded
// some nodes (e.g. item-tree-menu-bar) are expected to be present to switch modes
// so this has to go after all layouts are loaded
IOManager.setInitialDialogMode();
// most of IO handling relies on currentLayout being defined so it must follow setInitialDialogMode
IOManager.init();
// explicitly focus bubble input so one can begin typing right away
_id("bubble-input").refocusInput();
// Disabled all multiselect when citing notes
if (isCitingNotes) {