daf4a8fe4d
While trying to get translation and citing working with asynchronously generated data, we realized that drag-and-drop support was going to be...problematic. Firefox only supports synchronous methods for providing drag data (unlike, it seems, the DataTransferItem interface supported by Chrome), which means that we'd need to preload all relevant data on item selection (bounded by export.quickCopy.dragLimit) and keep the translate/cite methods synchronous (or maintain two separate versions). What we're trying instead is doing what I said in #518 we weren't going to do: loading most object data on startup and leaving many more functions synchronous. Essentially, this takes the various load*() methods described in #518, moves them to startup, and makes them operate on entire libraries rather than individual objects. The obvious downside here (other than undoing much of the work of the last many months) is that it increases startup time, potentially quite a lot for larger libraries. On my laptop, with a 3,000-item library, this adds about 3 seconds to startup time. I haven't yet tested with larger libraries. But I'm hoping that we can optimize this further to reduce that delay. Among other things, this is loading data for all libraries, when it should be able to load data only for the library being viewed. But this is also fundamentally just doing some SELECT queries and storing the results, so it really shouldn't need to be that slow (though performance may be bounded a bit here by XPCOM overhead). If we can make this fast enough, it means that third-party plugins should be able to remain much closer to their current designs. (Some things, including saving, will still need to be made asynchronous.)
101 lines
2.9 KiB
JavaScript
101 lines
2.9 KiB
JavaScript
"use strict";
|
|
|
|
describe("Related Box", function () {
|
|
var win, doc, itemsView;
|
|
|
|
before(function* () {
|
|
win = yield loadZoteroPane();
|
|
doc = win.document;
|
|
itemsView = win.ZoteroPane.itemsView;
|
|
});
|
|
after(function () {
|
|
win.close();
|
|
})
|
|
|
|
describe("Add button", function () {
|
|
it("should add a related item", function* () {
|
|
var item1 = yield createDataObject('item');
|
|
var item2 = yield createDataObject('item');
|
|
|
|
// Select the Related pane
|
|
var tabbox = doc.getElementById('zotero-view-tabbox');
|
|
tabbox.selectedIndex = 3;
|
|
var relatedbox = doc.getElementById('zotero-editpane-related');
|
|
assert.lengthOf(relatedbox.id('relatedRows').childNodes, 0);
|
|
|
|
// Click the Add button to open the Select Items dialog
|
|
setTimeout(function () {
|
|
relatedbox.id('addButton').click();
|
|
});
|
|
var selectWin = yield waitForWindow('chrome://zotero/content/selectItemsDialog.xul');
|
|
// wrappedJSObject isn't working on zotero-collections-tree for some reason, so
|
|
// just wait for the items tree to be created and select it directly
|
|
do {
|
|
var view = selectWin.document.getElementById('zotero-items-tree').view.wrappedJSObject;
|
|
yield Zotero.Promise.delay(50);
|
|
}
|
|
while (!view);
|
|
var deferred = Zotero.Promise.defer();
|
|
view.addEventListener('load', () => deferred.resolve());
|
|
yield deferred.promise;
|
|
|
|
// Select the other item
|
|
for (let i = 0; i < view.rowCount; i++) {
|
|
if (view.getRow(i).ref.id == item1.id) {
|
|
view.selection.select(i);
|
|
}
|
|
}
|
|
selectWin.document.documentElement.acceptDialog();
|
|
|
|
// Wait for relations list to populate
|
|
do {
|
|
yield Zotero.Promise.delay(50);
|
|
}
|
|
while (!relatedbox.id('relatedRows').childNodes.length);
|
|
|
|
assert.lengthOf(relatedbox.id('relatedRows').childNodes, 1);
|
|
|
|
var items = item1.relatedItems;
|
|
assert.lengthOf(items, 1);
|
|
assert.equal(items[0], item2.key);
|
|
|
|
// Relation should be assigned bidirectionally
|
|
var items = item2.relatedItems;
|
|
assert.lengthOf(items, 1);
|
|
assert.equal(items[0], item1.key);
|
|
})
|
|
})
|
|
|
|
describe("Remove button", function () {
|
|
it("should remove a related item", function* () {
|
|
var item1 = yield createDataObject('item');
|
|
var item2 = yield createDataObject('item');
|
|
|
|
item1.addRelatedItem(item2);
|
|
yield item1.saveTx();
|
|
item2.addRelatedItem(item1);
|
|
yield item2.saveTx();
|
|
|
|
// Select the Related pane
|
|
var tabbox = doc.getElementById('zotero-view-tabbox');
|
|
tabbox.selectedIndex = 3;
|
|
var relatedbox = doc.getElementById('zotero-editpane-related');
|
|
|
|
// Wait for relations list to populate
|
|
do {
|
|
yield Zotero.Promise.delay(50);
|
|
}
|
|
while (!relatedbox.id('relatedRows').childNodes.length);
|
|
|
|
doc.getAnonymousNodes(relatedbox)[0]
|
|
.getElementsByAttribute('value', '-')[0]
|
|
.click();
|
|
|
|
// Wait for relations list to clear
|
|
do {
|
|
yield Zotero.Promise.delay(50);
|
|
}
|
|
while (relatedbox.id('relatedRows').childNodes.length);
|
|
})
|
|
})
|
|
})
|