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

Fix collectionTreeView::expandToCollection()

Browse source
This commit is contained in:
Dan Stillman 2015-06-01 15:31:57 -04:00
parent c2e7b8ccc0
commit bf0d2a1bf4
3 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chrome/content/zotero/xpcom/collectionTreeView.js
View file

@ -820,9 +820,9 @@ Zotero.CollectionTreeView.prototype.expandToCollection = Zotero.Promise.coroutin
return true;
}
var path = [];
var parent;
while (parent = col.parentID) {
path.unshift(parent);
var parentID;
while (parentID = col.parentID) {
path.unshift(parentID);
col = yield Zotero.Collections.getAsync(parentID);
}
for each(var id in path) {

2
chrome/content/zotero/xpcom/libraryTreeView.js
View file

@ -81,7 +81,7 @@ Zotero.LibraryTreeView.prototype = {
* @param {String} - Row id
* @return {Integer}
*/
getRowByID: function (id) {
getRowIndexByID: function (id) {
// FIXME: Should work for itemIDs too
var type = id[0];
id = ('' + id).substr(1);

27
test/tests/collectionTreeViewTest.js
View file

@ -48,6 +48,27 @@ describe("Zotero.CollectionTreeView", function() {
})
})
describe("#expandToCollection()", function () {
it("should expand a collection to a subcollection", function* () {
var cv = collectionsView;
var collection1 = yield createDataObject('collection');
var collection2 = createUnsavedDataObject('collection');
collection2.parentID = collection1.id;
yield collection2.save({
skipSelect: true
});
var row = cv.getRowIndexByID("C" + collection1.id);
assert.isFalse(cv.isContainerOpen(row));
yield cv.expandToCollection(collection2.id);
// Make sure parent row position hasn't changed
assert.equal(cv.getRowIndexByID("C" + collection1.id), row);
// Parent should have been opened
assert.isTrue(cv.isContainerOpen(row));
})
})
describe("#selectByID()", function () {
it("should select the trash", function* () {
yield collectionsView.selectByID("T1");
@ -60,7 +81,7 @@ describe("Zotero.CollectionTreeView", function() {
describe("#selectWait()", function () {
it("shouldn't hang if row is already selected", function* () {
var row = collectionsView.getRowByID("T" + Zotero.Libraries.userLibraryID);
var row = collectionsView.getRowIndexByID("T" + Zotero.Libraries.userLibraryID);
collectionsView.selection.select(row);
yield Zotero.Promise.delay(50);
yield collectionsView.selectWait(row);
@ -175,7 +196,7 @@ describe("Zotero.CollectionTreeView", function() {
var item = yield createDataObject('item', false, {
skipSelect: true
});
var row = collectionsView.getRowByID("C" + collection.id);
var row = collectionsView.getRowIndexByID("C" + collection.id);
// Add observer to wait for collection add
var deferred = Zotero.Promise.defer();
@ -241,7 +262,7 @@ describe("Zotero.CollectionTreeView", function() {
parentItemID: item.id
});
var row = collectionsView.getRowByID("L" + group.libraryID);
var row = collectionsView.getRowIndexByID("L" + group.libraryID);
// Simulate a drag and drop
var stub = sinon.stub(Zotero.DragDrop, "getDragTarget");