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

Fix hang running tests (since d88cfc6c5f)

Browse Source
This commit is contained in:
Dan Stillman 2016-11-16 10:53:21 -05:00
parent bc3386ff9d
commit a1710c3307
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chrome/content/zotero/xpcom/schema.js
View File

@ -462,20 +462,22 @@ Zotero.Schema = new function(){
}
installLocation = installLocation.path;
let reinitOptions = { fromSchemaUpdate: true, noReinit: true };
// Update files
switch (mode) {
case 'styles':
yield Zotero.Styles.reinit({ fromSchemaUpdate: true, noReinit: true });
yield Zotero.Styles.reinit(reinitOptions);
var updated = yield _updateBundledFilesAtLocation(installLocation, mode);
case 'translators':
yield Zotero.Translators.reinit({ fromSchemaUpdate: true, noReinit: true });
yield Zotero.Translators.reinit(reinitOptions);
var updated = yield _updateBundledFilesAtLocation(installLocation, mode);
default:
yield Zotero.Translators.reinit({ fromSchemaUpdate: true, noReinit: true });
yield Zotero.Translators.reinit(reinitOptions);
let up1 = yield _updateBundledFilesAtLocation(installLocation, 'translators', true);
yield Zotero.Styles.reinit({ fromSchemaUpdate: true, noReinit: true });
yield Zotero.Styles.reinit(reinitOptions);
let up2 = yield _updateBundledFilesAtLocation(installLocation, 'styles');
var updated = up1 || up2;
}
@ -1660,8 +1662,8 @@ Zotero.Schema = new function(){
}
// Rebuild caches
yield Zotero.Translators.reinit();
yield Zotero.Styles.reinit();
yield Zotero.Translators.reinit({ fromSchemaUpdate: true });
yield Zotero.Styles.reinit({ fromSchemaUpdate: true });
}
catch (e) {
Zotero.debug(e, 1);