www

commit 376db8d9f0bbe7d90ee639ab9a40f3b0a2ccad49
parent 755f2bf6f996db2f31f48e468d4dd8a0c64e7a23
Author: Simon Kornblith <simon@simonster.com>
Date:   Mon, 18 Feb 2013 01:02:54 -0500

Ensure that we treat 403 as a failure code

Diffstat:
M
chrome/content/zotero/xpcom/connector/connector.js
 | 
14
++------------

1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/chrome/content/zotero/xpcom/connector/connector.js b/chrome/content/zotero/xpcom/connector/connector.js
@@ -120,15 +120,6 @@ Zotero.Connector = new function() {
 			});
 		}
 	}
-
-	// saner descriptions of some HTTP error codes
-	this.EXCEPTION_NOT_AVAILABLE = 0;
-	this.EXCEPTION_BAD_REQUEST = 400;
-	this.EXCEPTION_NO_ENDPOINT = 404;
-	this.EXCEPTION_INCOMPATIBLE_VERSION = 412;
-	this.EXCEPTION_CONNECTOR_INTERNAL = 500;
-	this.EXCEPTION_METHOD_NOT_IMPLEMENTED = 501;
-	this.EXCEPTION_CODES = [0, 400, 404, 412, 500, 501];
 	
 	/**
 	 * Sends the XHR to execute an RPC call.
@@ -146,8 +137,7 @@ Zotero.Connector = new function() {
 		
 		var newCallback = function(req) {
 			try {
-				var isOnline = req.status !== Zotero.Connector.EXCEPTION_NOT_AVAILABLE
-					&& req.status !== Zotero.Connector.EXCEPTION_INCOMPATIBLE_VERSION;
+				var isOnline = req.status !== 0 && req.status !== 403 && req.status !== 412;
 				
 				if(Zotero.Connector.isOnline !== isOnline) {
 					Zotero.Connector.isOnline = isOnline;
@@ -156,7 +146,7 @@ Zotero.Connector = new function() {
 					}
 				}
 				
-				if(Zotero.Connector.EXCEPTION_CODES.indexOf(req.status) !== -1) {
+				if(req.status == 0 || req.status >= 400) {
 					Zotero.debug("Connector: Method "+method+" failed with status "+req.status);
 					if(callback) callback(false, req.status);