From c3f0e65cf54df29573654ee6bd2399bbf456bbfb Mon Sep 17 00:00:00 2001
From: Anthony Lieuallen <arantius@gmail.com>
Date: Tue, 29 Apr 2008 00:29:38 +0000
Subject: [PATCH]  * Wire up the new UI, in the net error page.

---
 content/netError.xhtml              |  6 ++-
 content/resurrect-select-mirror.xul |  2 +
 content/resurrect.js                | 61 +++++++++--------------------
 locale/en-US/overlay.dtd            |  2 +-
 skin/netError.css                   |  4 +-
 5 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/content/netError.xhtml b/content/netError.xhtml
index c34dac1..0e2d9cb 100644
--- a/content/netError.xhtml
+++ b/content/netError.xhtml
@@ -290,7 +290,11 @@
       <xul:button id="errorTryAgain" label="&retry.label;" oncommand="retryThis(this);" />
 
       <fieldset id='resurrect'>
-        <legend>
+        <!-- fake elements so getElementById() doesn't die -->
+        <div id='targetTab' style='display: none;'></div>
+        <div id='targetWin' style='display: none;'></div>
+
+		<legend>
           <img src='chrome://resurrect/skin/tb-icon-small.png' />
           &resurrect.thispage;
         </legend>
diff --git a/content/resurrect-select-mirror.xul b/content/resurrect-select-mirror.xul
index c0f0e68..7b96e2d 100644
--- a/content/resurrect-select-mirror.xul
+++ b/content/resurrect-select-mirror.xul
@@ -23,6 +23,7 @@
 	</radiogroup>
 
 	<label value='&resurrect.fromMirror;' />
+	<vbox id='resurrect'>
 	<button
 		value='coralcdn' label=' &resurrect.coralcdn;'
 		image='chrome://resurrect/skin/cacheicons/coralcdn.png'
@@ -47,6 +48,7 @@
 		value='msn' label=' &resurrect.msn;'
 		image='chrome://resurrect/skin/cacheicons/msn.png'
 	/>
+	</vbox>
 
 </vbox>
 
diff --git a/content/resurrect.js b/content/resurrect.js
index eb67f6d..fc31823 100644
--- a/content/resurrect.js
+++ b/content/resurrect.js
@@ -1,13 +1,5 @@
 var resurrect={
 
-	mirrors:[
-		{name:'CoralCDN', id:'coralcdn'},
-		{name:'Google Cache', id:'google'},
-		{name:'The Internet Archive', id:'archive'},
-		{name:'MSN Cache', id:'msn'},
-		{name:'Yahoo! Cache', id:'yahoo'}
-	],
-
 	originalDoc:null,
 	disabled:false,
 
@@ -19,7 +11,7 @@ var resurrect={
 		document.getElementById('contentAreaContextMenu')
 			.addEventListener('popupshowing', resurrect.toggleContextItems, false);
 
-		window.document.getElementById("appcontent").addEventListener(
+		window.document.getElementById('appcontent').addEventListener(
 			'DOMContentLoaded', resurrect.attachClickEvent, false
 		);
 	},
@@ -43,15 +35,9 @@ var resurrect={
 
 		var contentDoc=event.target;
 		if (contentDoc.documentURI.match(/^about:neterror/)) {
-			contentDoc.getElementById('mirror').addEventListener(
+			contentDoc.getElementById('resurrect').addEventListener(
 				'click', resurrect.clickedHtml, false
 			);
-			try {
-				// because this button isn't always there
-				contentDoc.getElementById('mirrorSelect').addEventListener(
-					'click', resurrect.clickedHtml, false
-				);
-			} catch (e) { }
 		}
 	},
 
@@ -80,7 +66,7 @@ var resurrect={
 		with (gBrowser) {
 			selectedTab=aTab;
 			mTabBox.selectedPanel=getBrowserForTab(mCurrentTab).parentNode;
-			mCurrentTab.selected = true;
+			mCurrentTab.selected=true;
 			updateCurrentBrowser();
 		}
 	},
@@ -100,6 +86,7 @@ var resurrect={
 
 	clickedHtml:function(event) {
 		return resurrect.clickHandler(
+			event,
 			event.target.ownerDocument,
 			event.target.ownerDocument,
 			event.target.ownerDocument.location.href
@@ -108,39 +95,29 @@ var resurrect={
 
 	clickedXul:function(event) {
 		return resurrect.clickHandler(
+			event,
 			event.target.ownerDocument,
 			window.arguments[0],
 			window.arguments[1]
 		);
 	},
 
-	clickHandler:function(ownerDoc, contentDoc, rawUrl) {
-		// Check, set, disabled status.
-		var listbox=ownerDoc.getElementById('mirror');
-
-		if (-1==listbox.selectedIndex) return false;
-		if (resurrect.disabled) return false;
-
+	clickHandler:function(event, ownerDoc, contentDoc, rawUrl) {
+		if (resurrect.disabled) return;
 		resurrect.disabled=true;
-		listbox.setAttribute('disabled', true);
-
-		var button=contentDoc.getElementById('mirrorSelect');
-		if (!button && ownerDoc.documentElement.getButton) {
-			button=ownerDoc.documentElement.getButton('accept');
-		}
-		button.setAttribute('disabled', true);
 
 		// Run the actual code.  After timeout for UI repaint.
-		setTimeout(resurrect.selectMirror, 1, ownerDoc, contentDoc, rawUrl);
+		setTimeout(
+			resurrect.selectMirror, 1,
+			event.target.getAttribute('value'), ownerDoc, contentDoc, rawUrl
+		);
 	},
 
-	selectMirror:function(ownerDoc, contentDoc, rawUrl) {
-		var listbox=ownerDoc.getElementById('mirror');
-
+	selectMirror:function(mirror, ownerDoc, contentDoc, rawUrl) {
 		var gotoUrl=null;
 		var encUrl=encodeURIComponent(rawUrl);
 
-		switch (listbox.value) {
+		switch (mirror) {
 		case 'coralcdn':
 			gotoUrl=rawUrl.substring(0, 8)+
 				rawUrl.substring(8).replace(/\//, '.nyud.net:8080/');
@@ -212,16 +189,16 @@ var resurrect={
 			} else {
 				contentDoc.location.assign(gotoUrl);
 			}
-		}
 
-		if ('chrome://resurrect/content/resurrect-select-mirror.xul'==window.document.location) {
-			// setTimeout avoids errors because the window is gone
-			setTimeout(window.close, 0);
+			if ('chrome://resurrect/content/resurrect-select-mirror.xul'==window.document.location) {
+				// setTimeout avoids errors because the window is gone
+				setTimeout(window.close, 0);
+			}
+		} else {
+			resurrect.disabled=false;
 		}
 	}
 
-// // // // // // // // // // // // // // // // // // // // // // // // // // //
-
 }//end var resurrect
 
 if ('undefined'!=typeof gBrowser) {
diff --git a/locale/en-US/overlay.dtd b/locale/en-US/overlay.dtd
index 35e7ddc..1a35d10 100644
--- a/locale/en-US/overlay.dtd
+++ b/locale/en-US/overlay.dtd
@@ -9,7 +9,7 @@
 <!ENTITY resurrect.textonly " (text only)">
 <!ENTITY resurrect.yahoo "Yahoo! Cache">
 <!ENTITY resurrect.archive "The Internet Archive">
-<!ENTITY resurrect.msn "MSN Cache">
+<!ENTITY resurrect.msn "Live Search (MSN) Cache">
 <!ENTITY resurrect.inCurrTab "In the current tab/window">
 <!ENTITY resurrect.inNewTab "In a new tab">
 <!ENTITY resurrect.inNewWin "In a new window">
diff --git a/skin/netError.css b/skin/netError.css
index 98ecaa6..755b6d2 100644
--- a/skin/netError.css
+++ b/skin/netError.css
@@ -1,6 +1,6 @@
 div#errorPageContainer {
-	padding-right: 17em;
-	max-width: 47em;
+	padding-right: 20em;
+	max-width: 45em;
 }
 
 fieldset#resurrect {