Remove some old connector code
This commit is contained in:
parent
920461cd9d
commit
95caebde2b
3 changed files with 5 additions and 34 deletions
|
@ -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;
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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");
|
||||
|
||||
|
|
Loading…
Reference in a new issue