www

commit 5305f37ab4187bcfc9dcb1de735183032ff63f5b
parent 39c1024461b67965a79005ec8f2903f806fad639
Author: Simon Kornblith <simon@simonster.com>
Date:   Tue,  6 Nov 2012 02:51:34 -0500

Tweaks to processDocuments

Diffstat:
M
chrome/content/zotero/xpcom/http.js
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/chrome/content/zotero/xpcom/http.js b/chrome/content/zotero/xpcom/http.js
@@ -512,10 +512,9 @@ Zotero.HTTP = new function() {
 						exception(e);
 						return;
 					} else {
+						if(!dontDelete) Zotero.Browser.deleteHiddenBrowser(hiddenBrowsers);
 						throw(e);
 					}
-				} finally {
-					doLoad();
 				}
 			} else {
 				if(!dontDelete) Zotero.Browser.deleteHiddenBrowser(hiddenBrowsers);
@@ -530,8 +529,8 @@ Zotero.HTTP = new function() {
 		var onLoad = function(e) {
 			var hiddenBrowser = e.currentTarget,
 				doc = hiddenBrowser.contentDocument;
-			if(!doc || doc !== e.target) return;
-			var url = doc.location.href.toString();
+			if(!doc) return;
+			var url = doc.documentURI;
 			if(url === "about:blank") return;
 			if(doc.readyState === "loading" && (firedLoadEvent++) < 120) {
 				// Try again in a second