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

Fix items list problems when adding item with a search entered

Browse source 
When an item is created, an active quick search is cleared, but that's
now an async operation. We weren't waiting for that, which meant that
new items weren't selected and depending on a race condition could even
show the welcome pane despite there being items in the library.
This commit is contained in:
Dan Stillman 2017-10-24 04:54:36 -04:00
parent 1a779bb7aa
commit 73d88421bb
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
chrome/content/zotero/xpcom/itemTreeView.js
View file

@ -811,8 +811,14 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
}
if (!allDeleted) {
// DEBUG: Search is async, so this might not work properly
quicksearch.doCommand();
// See _refreshPromise note below
if (this._refreshPromise) {
try {
yield this._refreshPromise;
}
catch (e) {}
}
madeChanges = true;
sort = true;
}
@ -873,6 +879,15 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
}
}
quicksearch.doCommand();
// We have to wait for the search in order to select new items properly, but doCommand()
// doesn't provide the return value from the oncommand handler, so we can't wait for an
// asynchronous handler. But really they just end up calling refresh(), so we wait for that.
if (this._refreshPromise) {
try {
yield this._refreshPromise;
}
catch (e) {}
}
madeChanges = true;
sort = true;
}

22
test/tests/itemTreeViewTest.js
View file

@ -137,6 +137,28 @@ describe("Zotero.ItemTreeView", function() {
assert.equal(selected[0], existingItemID);
});
it("should clear search and select new item if non-matching quick search is active", async function () {
await createDataObject('item');
var quicksearch = win.document.getElementById('zotero-tb-search');
quicksearch.value = Zotero.randomString();
quicksearch.doCommand();
await itemsView._refreshPromise;
assert.equal(itemsView.rowCount, 0);
// Create item
var item = await createDataObject('item');
assert.isAbove(itemsView.rowCount, 0);
assert.equal(quicksearch.value, '');
// New item should be selected
var selected = itemsView.getSelectedItems();
assert.lengthOf(selected, 1);
assert.equal(selected[0].id, item.id);
});
it("shouldn't clear quicksearch if skipSelect is passed", function* () {
var searchString = Zotero.Items.get(existingItemID).getField('title');