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

Merge branch 'fx60'

Browse source
This commit is contained in:
Dan Stillman 2019-10-21 21:44:01 -04:00
commit d4f682aa88
152 changed files with 13336 additions and 5410 deletions
Download patch file Download diff file Expand all files Collapse all files

17
test/content/support.js
View file

@ -58,17 +58,24 @@ function loadBrowserWindow() {
*
* @param {Window} [win] - Existing window to use; if not specified, a new window is opened
*/
var loadZoteroPane = Zotero.Promise.coroutine(function* (win) {
var loadZoteroPane = async function (win) {
if (!win) {
var win = yield loadBrowserWindow();
var win = await loadBrowserWindow();
}
Zotero.Prefs.clear('lastViewedFolder');
win.ZoteroOverlay.toggleDisplay(true);
yield waitForItemsLoad(win, 0);
while (true) {
if (win.ZoteroPane && win.ZoteroPane.collectionsView) {
break;
}
Zotero.debug("Waiting for ZoteroPane initialization");
await Zotero.Promise.delay(50);
}
await waitForItemsLoad(win, 0);
return win;
});
};
var loadPrefPane = Zotero.Promise.coroutine(function* (paneName) {
var id = 'zotero-prefpane-' + paneName;