From 6c14cd50bfd6d37b56b1ce741c5d9ea283b28b2e Mon Sep 17 00:00:00 2001
From: Anthony Lieuallen <arantius@gmail.com>
Date: Sun, 8 Oct 2006 17:49:45 +0000
Subject: [PATCH] -

---
 content/resurrect-select-mirror.xul |  4 ++--
 content/resurrect.js                | 28 +++++++++++++++++++---------
 install.rdf                         |  8 ++++----
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/content/resurrect-select-mirror.xul b/content/resurrect-select-mirror.xul
index 953975b..79056d6 100644
--- a/content/resurrect-select-mirror.xul
+++ b/content/resurrect-select-mirror.xul
@@ -7,7 +7,7 @@
 	title="&resurrect.title;"
 	buttons="accept, cancel"
 	onload="document.getElementById('mirror').focus();"
-	ondialogaccept="return resurrect.selectMirror(event);"
+	ondialogaccept="return resurrect.clickedXul(event);"
 	persist="width height screenX screenY"
 >
 
@@ -23,7 +23,7 @@
 
 		<label value='&resurrect.fromMirror;' />
 		<listbox id='mirror' rows='5' 
-			onclick='resurrect.selectMirror(event);'
+			onclick='resurrect.clickedXul(event);'
 		>
 			<listitem value='coralcdn' label='&resurrect.coralcdn;' />
 			<listitem value='google' label='&resurrect.google;' />
diff --git a/content/resurrect.js b/content/resurrect.js
index 85c467f..fde5d3a 100644
--- a/content/resurrect.js
+++ b/content/resurrect.js
@@ -44,12 +44,12 @@ var resurrect={
 		var contentDoc=event.target;
 		if (contentDoc.documentURI.match(/^about:neterror/)) {
 			contentDoc.getElementById('mirror').addEventListener(
-				'click', resurrect.selectMirror, false
+				'click', resurrect.clickedHtml, false
 			);
 			try {
 				// because this button isn't always there
 				contentDoc.getElementById('mirrorSelect').addEventListener(
-					'click', resurrect.selectMirror, false
+					'click', resurrect.clickedHtml, false
 				);
 			} catch (e) { }
 		}
@@ -98,18 +98,28 @@ var resurrect={
 		);
 	},
 
-	selectMirror:function(event) {
-		var ownerDoc=event.target.ownerDocument;
+	clickedHtml:function(event) {
+		resurrect.selectMirror(
+			event.target.ownerDocument,
+			event.target.ownerDocument,
+			event.target.ownerDocument.location.href
+		);
+	},
+
+	clickedXul:function(event) {
+		resurrect.selectMirror(
+			event.target.ownerDocument,
+			window.arguments[0],
+			window.arguments[1]
+		);
+	},
+
+	selectMirror:function(ownerDoc, contentDoc, rawUrl) {
 		var listbox=ownerDoc.getElementById('mirror');
 		if (resurrect.disabled) return false;
 		resurrect.disabled=true;
 
-		// find the content document -- this depends on whether we are
-		// living inline in the netError page
-		var contentDoc=window.arguments[0];
-
 		var gotoUrl=null;
-		var rawUrl=window.arguments[1];
 		var encUrl=encodeURIComponent(rawUrl);
 
 		switch (listbox.value) {
diff --git a/install.rdf b/install.rdf
index babd62f..6832c99 100644
--- a/install.rdf
+++ b/install.rdf
@@ -3,11 +3,11 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>{0c8fbd76-bdeb-4c52-9b24-d587ce7b9dc3}</em:id>
 		<em:name>Resurrect Pages</em:name>
-		<em:version>1.0.2</em:version>
+		<em:version>1.0.3</em:version>
 		<em:description>Resurrect dead pages, by finding their ghosts.</em:description>
 
-		<em:homepageURL>http://www.arantius.com/article/resurrect</em:homepageURL>
-		<em:updateURL>http://www.arantius.com/misc/firefox-extensions/mine/updates.rdf</em:updateURL>
+		<em:homepageURL>http://firefox-extensions.arantius.com/resurrect</em:homepageURL>
+		<em:updateURL>http://arantius.com/misc/firefox-extensions/mine/updates.rdf</em:updateURL>
 		<em:iconURL>chrome://resurrect/skin/em-icon.png</em:iconURL>
 
 		<em:creator>Anthony Lieuallen</em:creator>
@@ -17,7 +17,7 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>1.5</em:minVersion>
-				<em:maxVersion>2.0.*</em:maxVersion>
+				<em:maxVersion>2.0.0.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 	</Description>