diff --git a/chrome/content/zotero/xpcom/debug.js b/chrome/content/zotero/xpcom/debug.js index 9a3e9fa6ad..71d0c3f56c 100644 --- a/chrome/content/zotero/xpcom/debug.js +++ b/chrome/content/zotero/xpcom/debug.js @@ -219,20 +219,10 @@ Zotero.Debug = new function () { } return Zotero.getSystemInfo().then(function(sysInfo) { - if (Zotero.isConnector) { - return Zotero.Errors.getErrors().then(function(errors) { - return errors.join('\n\n') + - "\n\n" + sysInfo + "\n\n" + - "=========================================================\n\n" + - output; - }); - } - else { - return Zotero.getErrors(true).join('\n\n') + - "\n\n" + sysInfo + "\n\n" + - "=========================================================\n\n" + - output; - } + return Zotero.getErrors(true).join('\n\n') + + "\n\n" + sysInfo + "\n\n" + + "=========================================================\n\n" + + output; }); }); diff --git a/chrome/content/zotero/xpcom/proxy.js b/chrome/content/zotero/xpcom/proxy.js index 074090251e..05f08d6441 100644 --- a/chrome/content/zotero/xpcom/proxy.js +++ b/chrome/content/zotero/xpcom/proxy.js @@ -55,7 +55,7 @@ Zotero.Proxies = new function() { } } - Zotero.Proxies.transparent = !Zotero.isConnector && Zotero.Prefs.get("proxies.transparent"); + Zotero.Proxies.transparent = Zotero.Prefs.get("proxies.transparent"); Zotero.Proxies.autoRecognize = Zotero.Proxies.transparent && Zotero.Prefs.get("proxies.autoRecognize"); var disableByDomainPref = Zotero.Prefs.get("proxies.disableByDomain"); diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index f2e4b4e0c8..957a826840 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -430,11 +430,6 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js"); this.initialized = true; this.initializationDeferred.resolve(); - if(Zotero.isConnector) { - Zotero.Repo.init(); - Zotero.locked = false; - } - if(!Zotero.isFirstLoadThisSession) { // trigger zotero-reloaded event Zotero.debug('Triggering "zotero-reloaded" event'); @@ -856,20 +851,6 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js"); } - /** - * Called when the DB has been released by another Zotero process to perform necessary - * initialization steps - */ - this.onDBLockReleased = function() { - if(Zotero.isConnector) { - // if DB lock is released, switch out of connector mode - switchConnectorMode(false); - } else if(_waitingForDBLock) { - // if waiting for DB lock and we get it, continue init - _waitingForDBLock = false; - } - } - this.shutdown = Zotero.Promise.coroutine(function* () { Zotero.debug("Shutting down Zotero");