From 85430a5aa3b16cb9913df7c0fee87aa59bab3b36 Mon Sep 17 00:00:00 2001
From: Anthony Lieuallen <arantius@gmail.com>
Date: Sun, 18 Jun 2006 00:41:53 +0000
Subject: [PATCH] target opening options

---
 content/resurrect-select-mirror.xul |  8 +++++++-
 content/resurrect.js                | 30 ++++++++++++++++++++++++++++-
 install.rdf                         |  2 +-
 locale/en-US/overlay.dtd            | 25 ++++++++++++++----------
 4 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/content/resurrect-select-mirror.xul b/content/resurrect-select-mirror.xul
index f546299..953975b 100644
--- a/content/resurrect-select-mirror.xul
+++ b/content/resurrect-select-mirror.xul
@@ -14,8 +14,14 @@
 	<script	type='application/x-javascript'	src='chrome://resurrect/content/resurrect.js'></script>
 
 	<vbox>
-		<label value='&resurrect.selectmirror;' />
+		<label value='&resurrect.this;' />
+		<radiogroup>
+			<radio id='targetCurr' label='&resurrect.inCurrTab;' selected='true' />
+			<radio id='targetTab' label='&resurrect.inNewTab;' />
+			<radio id='targetWin' label='&resurrect.inNewWin;' />
+		</radiogroup>
 
+		<label value='&resurrect.fromMirror;' />
 		<listbox id='mirror' rows='5' 
 			onclick='resurrect.selectMirror(event);'
 		>
diff --git a/content/resurrect.js b/content/resurrect.js
index c849fcc..28af61b 100644
--- a/content/resurrect.js
+++ b/content/resurrect.js
@@ -72,6 +72,17 @@ var resurrect={
 		return null;
 	},
 
+// // // // // // // // // // // // // // // // // // // // // // // // // // //
+
+	selectTab:function(aTab) {
+		with (gBrowser) {
+			selectedTab=aTab;
+			mTabBox.selectedPanel=getBrowserForTab(mCurrentTab).parentNode;
+			mCurrentTab.selected = true;
+			updateCurrentBrowser();
+		}
+	},
+
 // // // // // // // // // // // // // // // // // // // // // // // // // // //
 
 	showDialog:function(url) {
@@ -153,8 +164,25 @@ var resurrect={
 			return false;
 			break;
 		}
+
 		if (gotoUrl) {
-			contentDoc.location.assign(gotoUrl);
+			if (ownerDoc.getElementById('targetTab').getAttribute('selected')) {
+				var newTab=window.opener.gBrowser.addTab(gotoUrl);
+
+				//replicate broken focus-new-tab functionality
+				var prefServ=Components.classes['@mozilla.org/preferences-service;1']
+					.getService(Components.interfaces.nsIPrefBranch);
+				if (!prefServ.getBoolPref('browser.tabs.loadInBackground')) {
+					window.opener.resurrect.selectTab(newTab);
+				}
+			} else if (ownerDoc.getElementById('targetWin').getAttribute('selected')) {
+				// the setTimeout keeps focus from returning to the opener
+				setTimeout(function(){
+					window.opener.openNewWindowWith(gotoUrl, null, null);
+				}, 10);
+			} else {
+				contentDoc.location.assign(gotoUrl);
+			}
 		}
 
 		if ('chrome://resurrect/content/resurrect-select-mirror.xul'==window.document.location) {
diff --git a/install.rdf b/install.rdf
index e2e17a6..e43fa32 100644
--- a/install.rdf
+++ b/install.rdf
@@ -3,7 +3,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>{0c8fbd76-bdeb-4c52-9b24-d587ce7b9dc3}</em:id>
 		<em:name>Resurrect Pages</em:name>
-		<em:version>0.6</em:version>
+		<em:version>0.9</em:version>
 		<em:description>Resurrect dead pages, by finding their ghosts.</em:description>
 		<em:creator>Anthony Lieuallen</em:creator>
 		<em:homepageURL>http://www.arantius.com/article/resurrect</em:homepageURL>
diff --git a/locale/en-US/overlay.dtd b/locale/en-US/overlay.dtd
index 1c8ecdd..403e6e5 100644
--- a/locale/en-US/overlay.dtd
+++ b/locale/en-US/overlay.dtd
@@ -1,11 +1,16 @@
-<!ENTITY resurrect.title        "Resurrect">
-<!ENTITY resurrect.accesskey    "u">
-<!ENTITY resurrect.thispage     "Resurrect this page">
-<!ENTITY resurrect.thislink     "Resurrect this link">
-<!ENTITY resurrect.selectmirror "Select a mirror:">
+<!ENTITY resurrect.title         "Resurrect">
+<!ENTITY resurrect.accesskey     "u">
+<!ENTITY resurrect.this          "Resurrect this">
+<!ENTITY resurrect.thispage      "Resurrect this page">
+<!ENTITY resurrect.thislink      "Resurrect this link">
+<!ENTITY resurrect.fromMirror    "From mirror">
 
-<!ENTITY resurrect.coralcdn     "CoralCDN">
-<!ENTITY resurrect.google       "Google Cache">
-<!ENTITY resurrect.yahoo        "Yahoo! Cache">
-<!ENTITY resurrect.archive      "The Internet Archive">
-<!ENTITY resurrect.msn          "MSN Cache">
+<!ENTITY resurrect.coralcdn      "CoralCDN">
+<!ENTITY resurrect.google        "Google Cache">
+<!ENTITY resurrect.yahoo         "Yahoo! Cache">
+<!ENTITY resurrect.archive       "The Internet Archive">
+<!ENTITY resurrect.msn           "MSN Cache">
+
+<!ENTITY resurrect.inCurrTab     "In the current tab/window">
+<!ENTITY resurrect.inNewTab      "In a new tab">
+<!ENTITY resurrect.inNewWin      "In a new window">