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

Run a focused button's action on Enter in Advanced Search

Browse source 
The pane-level Enter handler ran the default action (save in the saved
editor, submit in the temporary pane) regardless of the event target, so
Enter with focus on the Cancel button saved and closed the editor, and
Enter on Clear ran the search. Click the focused button instead, which
the platform otherwise only does for Space.
This commit is contained in:
Dan Stillman 2026-07-05 17:01:09 -04:00
parent a6c3ad51ef
commit 3a34c6a18f
2 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
chrome/content/zotero/elements/advancedSearchPane.js
View file

@ -78,6 +78,13 @@
// Shift-Enter adds a new condition (handled by the search element), so
// don't run/save the search for it
if (event.key === 'Enter' && !event.shiftKey) {
// Enter on a focused button runs that button (which the platform only does
// for Space), not the pane's default action
let button = event.target.closest && event.target.closest('button, toolbarbutton');
if (button) {
button.click();
return;
}
if (this.type === 'temporary') {
await this.submit();
}

29
test/tests/advancedSearchTest.js
View file

@ -692,6 +692,35 @@ describe("Advanced Search", function () {
await selectLibrary(win);
});
it("should run a focused button's action on Enter instead of the pane default", async function () {
var saved = await createDataObject('search', { name: "EnterOnCancel" });
await select(win, saved);
await zp.setSavedSearchEditorState('open');
assert.equal(deck.selectedSearchType, 'saved');
var savedPane = deck.pane;
var save = sinon.stub(savedPane, 'save');
var cancel = sinon.stub(savedPane, 'cancel');
try {
var cancelButton = savedPane.querySelector('.cancel-button');
cancelButton.focus();
cancelButton.dispatchEvent(
new win.KeyboardEvent('keydown', { key: 'Enter', bubbles: true, cancelable: true })
);
// Enter on the focused Cancel button cancels -- it mustn't save
assert.isTrue(save.notCalled);
assert.isTrue(cancel.called);
}
finally {
save.restore();
cancel.restore();
}
await zp.setSavedSearchEditorState('closed');
await saved.eraseTx();
await selectLibrary(win);
});
it("should prompt for a name when saving a new search", async function () {
await selectLibrary(win);
await zp.toggleAdvancedSearchState('open');