www

commit e63364c7882e816fb35f85cce2f47146f5993afa
parent ee16d96f92c53a4400ae78d9d25d8e28d49d4570
Author: Simon Kornblith <simon@simonster.com>
Date:   Mon, 18 Feb 2013 01:03:15 -0500

Merge branch '3.0'

Diffstat:
M
chrome/content/zotero/standalone/standalone.xul
 | 
2
+-
M
chrome/content/zotero/xpcom/connector/connector.js
 | 
14
++------------
M
chrome/skin/default/zotero/standalone.css
 | 
5
+++++

3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/chrome/content/zotero/standalone/standalone.xul b/chrome/content/zotero/standalone/standalone.xul
@@ -46,7 +46,7 @@
 				xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 				windowtype="navigator:browser" 
 				title="&brandShortName;"
-				width="900" height="500"
+				width="915" height="500"
 				persist="screenX screenY width height sizemode"> 
 	<script type="application/javascript;version=1.8" src="standalone.js"/>
 	<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
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);
 					
diff --git a/chrome/skin/default/zotero/standalone.css b/chrome/skin/default/zotero/standalone.css
@@ -1,4 +1,9 @@
 #zotero-tb-item-from-page, #zotero-tb-snapshot-from-page, #zotero-tb-link-from-page,
 #zotero-tb-fullscreen, #zotero-fullscreen-close-separator, #zotero-close-button {
 	display: none;
+}
+
+#main-window {
+	min-width: 915px;
+	min-height: 300px;
 }
 \ No newline at end of file