suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't select sibling on attachment removal if attachment was unselected

Browse Source 
Fixes #1173
This commit is contained in:
Dan Stillman 2017-02-21 01:21:07 -05:00
parent 60b2e16746
commit 333675d8ea
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chrome/content/zotero/xpcom/itemTreeView.js
View File

@ -901,9 +901,10 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
this.rememberSelection(savedSelection); this.rememberSelection(savedSelection);
} }
} }
// On removal of a row, select item at previous position // On removal of a selected row, select item at previous position
else if (savedSelection.length) { else if (savedSelection.length) {
if (action == 'remove' || action == 'trash' || action == 'delete') { if ((action == 'remove' || action == 'trash' || action == 'delete')
&& savedSelection.some(id => this.getRowIndexByID(id) === false)) {
// In duplicates view, select the next set on delete // In duplicates view, select the next set on delete
if (collectionTreeRow.isDuplicates()) { if (collectionTreeRow.isDuplicates()) {
if (this._rows[previousFirstSelectedRow]) { if (this._rows[previousFirstSelectedRow]) {

12
test/tests/itemTreeViewTest.js
View File

@ -269,7 +269,17 @@ describe("Zotero.ItemTreeView", function() {
assert.equal(itemsView.selection.currentIndex, 2); assert.equal(itemsView.selection.currentIndex, 2);
yield Zotero.Items.erase(items.map(item => item.id)); yield Zotero.Items.erase(items.map(item => item.id));
}) });
it("shouldn't select sibling on attachment erase if attachment wasn't selected", function* () {
var item = yield createDataObject('item');
var att1 = yield importFileAttachment('test.png', { title: 'A', parentItemID: item.id });
var att2 = yield importFileAttachment('test.png', { title: 'B', parentItemID: item.id });
yield zp.itemsView.selectItem(att2.id); // expand
yield zp.itemsView.selectItem(item.id);
yield att1.eraseTx();
assert.sameMembers(zp.itemsView.getSelectedItems(true), [item.id]);
});
it("should keep first visible item in view when other items are added with skipSelect and nothing in view is selected", function* () { it("should keep first visible item in view when other items are added with skipSelect and nothing in view is selected", function* () {
var collection = yield createDataObject('collection'); var collection = yield createDataObject('collection');