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

Fix hang in collectionsTreeView::selectWait() if row is already selected

Browse source
This commit is contained in:
Dan Stillman 2015-05-25 01:43:07 -04:00
parent 43762248a4
commit cbbdebc5b7
6 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -262,6 +262,9 @@ Zotero.CollectionTreeView.prototype.selectWait = Zotero.Promise.method(function
this.selection.select(row);
return;
}
if (this.selection.currentIndex == row) {
return;
};
var deferred = Zotero.Promise.defer();
this.addEventListener('select', () => deferred.resolve());
this.selection.select(row);

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

@ -68,7 +68,7 @@ Zotero.ItemTreeView.prototype.type = 'item';
Zotero.ItemTreeView.prototype.setTree = Zotero.serial(Zotero.Promise.coroutine(function* (treebox)
{
try {
Zotero.debug("Setting tree for items view " + this.id);
Zotero.debug("Setting tree for " + this.collectionTreeRow.id + " items view " + this.id);
var start = Date.now();
// Try to set the window document if not yet set
if (treebox && !this._ownerDocument) {

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

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

1
test/content/support.js
View file

@ -41,6 +41,7 @@ function loadBrowserWindow() {
*/
var loadZoteroPane = Zotero.Promise.coroutine(function* () {
var win = yield loadBrowserWindow();
Zotero.Prefs.clear('lastViewedFolder');
win.ZoteroOverlay.toggleDisplay(true);
// Hack to wait for pane load to finish. This is the same hack

11
test/tests/collectionTreeViewTest.js
View file

@ -49,7 +49,7 @@ describe("Zotero.CollectionTreeView", function() {
})
})
describe("#selectByID", function () {
describe("#selectByID()", function () {
it("should select the trash", function* () {
yield collectionsView.selectByID("T1");
var row = collectionsView.selection.currentIndex;
@ -59,6 +59,15 @@ 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);
collectionsView.selection.select(row);
yield Zotero.Promise.delay(50);
yield collectionsView.selectWait(row);
})
})
describe("#notify()", function () {
it("should select a new collection", function* () {
// Create collection

5
test/tests/itemsTest.js
View file

@ -1,9 +1,10 @@
describe("Zotero.Items", function () {
var win, collectionsView;
var win, collectionsView, zp;
before(function* () {
win = yield loadZoteroPane();
collectionsView = win.ZoteroPane.collectionsView;
zp = win.ZoteroPane;
})
beforeEach(function () {
return selectLibrary(win);
@ -36,7 +37,7 @@ describe("Zotero.Items", function () {
assert.isFalse(yield Zotero.Items.getAsync(id1));
assert.isFalse(yield Zotero.Items.getAsync(id2));
assert.isFalse(yield Zotero.Items.getAsync(id3));
assert.equal(win.ZoteroPane.itemsView.rowCount, 0);
assert.equal(zp.itemsView.rowCount, 0);
})
})
});