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

Don't display startup error when switching into connector mode

Browse source 
And close DB on incompatible version error

This should make things a bit smoother for people upgrading to 5.0
before Zotero for Firefox is updated to the connector.
This commit is contained in:
Dan Stillman 2017-05-09 02:05:23 -04:00
parent 2ef84125e7
commit 4d4c0f9e73
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
chrome/content/zotero/overlay.js
View file

@ -103,6 +103,13 @@ var ZoteroOverlay = new function()
if(newMode == "connector") {
// save current state
_stateBeforeReload = !zoteroPane.hidden && !zoteroPane.collapsed;
// Don't display startup error when Standalone opens
if (Zotero.startupError) {
Zotero.debug(startupError, 1);
return;
}
// ensure pane is closed
if(!zoteroPane.collapsed) ZoteroOverlay.toggleDisplay(false, true);
}

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

@ -611,6 +611,8 @@ Components.utils.import("resource://gre/modules/Services.jsm");
}
catch (e) {
if (e instanceof Zotero.DB.IncompatibleVersionException) {
Zotero.DB.closeDatabase(true).then(() => Zotero.debug("Database closed"));
let kbURL = "https://www.zotero.org/support/kb/newer_db_version";
let msg = (e.dbClientVersion
? Zotero.getString('startupError.incompatibleDBVersion',