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

Fixes a bug where transparent proxies wouldn't be transparent until Zotero is restarted

Browse Source
This commit is contained in:
Simon Kornblith 2009-04-29 20:58:26 +00:00
parent b5974570e8
commit d2a4cf7680
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
chrome/content/zotero/xpcom/proxy.js
View File

@ -409,18 +409,14 @@ Zotero.Proxy.prototype.validate = function() {
*/ */
Zotero.Proxy.prototype.save = function(transparent) { Zotero.Proxy.prototype.save = function(transparent) {
// ensure this proxy is valid // ensure this proxy is valid
Zotero.debug(this);
var hasErrors = this.validate(); var hasErrors = this.validate();
if(hasErrors) throw "Zotero.Proxy: could not be saved because it is invalid: error "+hasErrors[0]; if(hasErrors) throw "Zotero.Proxy: could not be saved because it is invalid: error "+hasErrors[0];
// we never save any changes to non-persisting proxies, so this works
var newProxy = !!this.proxyID;
this.autoAssociate = this.multiHost && this.autoAssociate; this.autoAssociate = this.multiHost && this.autoAssociate;
this.compileRegexp(); this.compileRegexp();
if(this.proxyID) {
Zotero.Proxies.refreshHostMap(this);
if(!transparent) throw "Zotero.Proxy: cannot save transparent proxy without transparent param";
} else {
Zotero.Proxies.save(this);
}
if(transparent) { if(transparent) {
try { try {
@ -432,7 +428,7 @@ Zotero.Proxy.prototype.save = function(transparent) {
Zotero.DB.query("DELETE FROM proxyHosts WHERE proxyID = ?", [this.proxyID]); Zotero.DB.query("DELETE FROM proxyHosts WHERE proxyID = ?", [this.proxyID]);
} else { } else {
this.proxyID = Zotero.DB.query("INSERT INTO proxies (multiHost, autoAssociate, scheme) VALUES (?, ?, ?)", this.proxyID = Zotero.DB.query("INSERT INTO proxies (multiHost, autoAssociate, scheme) VALUES (?, ?, ?)",
[this.multiHost ? 1 : 0, this.autoAssociate ? 1 : 0, this.scheme]) [this.multiHost ? 1 : 0, this.autoAssociate ? 1 : 0, this.scheme]);
} }
this.hosts = this.hosts.sort(); this.hosts = this.hosts.sort();
@ -449,6 +445,13 @@ Zotero.Proxy.prototype.save = function(transparent) {
throw(e); throw(e);
} }
} }
if(newProxy) {
Zotero.Proxies.save(this);
} else {
Zotero.Proxies.refreshHostMap(this);
if(!transparent) throw "Zotero.Proxy: cannot save transparent proxy without transparent param";
}
} }
/** /**