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

Make IE standalone contact attempt time out, and connector error tweak in case connector can't be contacted at all

Browse Source
This commit is contained in:
Simon Kornblith 2011-09-05 01:51:34 +00:00
parent fbb0511c53
commit dc2d417c3d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chrome/content/zotero/xpcom/connector/connector.js
View File

@ -49,6 +49,7 @@ Zotero.Connector = new function() {
Zotero.debug("Connector: Looking for Zotero Standalone"); Zotero.debug("Connector: Looking for Zotero Standalone");
try { try {
var xdr = new XDomainRequest(); var xdr = new XDomainRequest();
xdr.timeout = 700;
xdr.open("POST", "http://127.0.0.1:23119/connector/ping", true); xdr.open("POST", "http://127.0.0.1:23119/connector/ping", true);
xdr.onerror = xdr.ontimeout = function() { xdr.onerror = xdr.ontimeout = function() {
Zotero.debug("Connector: Zotero Standalone is not online or cannot be contacted"); Zotero.debug("Connector: Zotero Standalone is not online or cannot be contacted");
@ -137,7 +138,7 @@ Zotero.Connector = new function() {
if(callback) callback(false, req.status); if(callback) callback(false, req.status);
// Check for incompatible version // Check for incompatible version
if(req.status === 404 || req.status === 412) { if(req.status === 412) {
if(Zotero.Connector_Browser && Zotero.Connector_Browser.onIncompatibleStandaloneVersion) { if(Zotero.Connector_Browser && Zotero.Connector_Browser.onIncompatibleStandaloneVersion) {
var standaloneVersion = req.getResponseHeader("X-Zotero-Version"); var standaloneVersion = req.getResponseHeader("X-Zotero-Version");
Zotero.Connector_Browser.onIncompatibleStandaloneVersion(Zotero.version, standaloneVersion); Zotero.Connector_Browser.onIncompatibleStandaloneVersion(Zotero.version, standaloneVersion);