From d2db84293871c9350c9d6f839e5597667fa37c41 Mon Sep 17 00:00:00 2001
From: Abe Jellinek <jellinek@berkeley.edu>
Date: Tue, 13 Jul 2021 00:33:57 -0700
Subject: [PATCH] Scaffold: Add action to open test URL in internal browser
 (#2117)

---
 chrome/content/scaffold/scaffold.js       | 22 +++++++++++++++++-----
 chrome/content/scaffold/scaffold.xul      |  7 ++++++-
 chrome/locale/en-US/scaffold/scaffold.dtd |  2 ++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/chrome/content/scaffold/scaffold.js b/chrome/content/scaffold/scaffold.js
index 871c0c53ba..faf4435fc5 100644
--- a/chrome/content/scaffold/scaffold.js
+++ b/chrome/content/scaffold/scaffold.js
@@ -1117,14 +1117,26 @@ var Scaffold = new function() {
 		Zotero.Utilities.Internal.copyTextToClipboard(urlOrData);
 	}
 	
-	/*
-	 * Open the url of the first selected test in the browser.
-	 */	
-	this.openURL = function() {
+	/**
+	 * Open the url of the first selected test in the browser (Browser tab or
+	 * the system's default browser).
+	 * @param {boolean} openExternally whether to open in the default browser
+	**/
+	this.openURL = function (openExternally) {
 		var listbox = document.getElementById("testing-listbox");
 		var item = listbox.selectedItems[0];
 		var url = item.getElementsByTagName("listcell")[0].getAttribute("label");
-		Zotero.launchURL(url);
+		if (openExternally) {
+			Zotero.launchURL(url);
+		}
+		else {
+			var tabs = document.getElementById('tabs');
+			_browser.loadURIWithFlags(
+				url,
+				Components.interfaces.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE
+			);
+			tabs.selectedItem = document.getElementById('tab-browser');
+		}
 	}
 	
 	/*
diff --git a/chrome/content/scaffold/scaffold.xul b/chrome/content/scaffold/scaffold.xul
index 440f2406c3..927d6feba7 100644
--- a/chrome/content/scaffold/scaffold.xul
+++ b/chrome/content/scaffold/scaffold.xul
@@ -52,7 +52,12 @@
 		<menupopup id="testing-context-menue">
 			<menuitem label="&scaffold.testing.edit.import;" tooltiptext="Edit the input data for the current test" oncommand="Scaffold.editImportFromTest()"/>
 			<menuitem label="&scaffold.testing.copyToClipboard;" tooltiptext="Copy the URL or data for the current test to the clipboard" oncommand="Scaffold.copyToClipboard()"/>
-			<menuitem label="&scaffold.testing.openUrl;" tooltiptext="Open the URL for the current test in the browser" oncommand="Scaffold.openURL()"/>
+			<menu label="&scaffold.testing.openUrl;">
+				<menupopup>
+					<menuitem label="&scaffold.testing.openUrl.internally;" tooltiptext="Open the URL for the current test in the Scaffold browser" oncommand="Scaffold.openURL(false)"/>
+					<menuitem label="&scaffold.testing.openUrl.externally;" tooltiptext="Open the URL for the current test in your default browser" oncommand="Scaffold.openURL(true)"/>
+				</menupopup>
+			</menu>
 		</menupopup>
 	</popupset>
 
diff --git a/chrome/locale/en-US/scaffold/scaffold.dtd b/chrome/locale/en-US/scaffold/scaffold.dtd
index f36cbed723..f43d623383 100644
--- a/chrome/locale/en-US/scaffold/scaffold.dtd
+++ b/chrome/locale/en-US/scaffold/scaffold.dtd
@@ -74,3 +74,5 @@
 <!ENTITY scaffold.testing.edit.import			"Edit Import">
 <!ENTITY scaffold.testing.copyToClipboard			"Copy to Clipboard">
 <!ENTITY scaffold.testing.openUrl			"Open URL">
+<!ENTITY scaffold.testing.openUrl.internally			"In Browser Tab">
+<!ENTITY scaffold.testing.openUrl.externally			"In External Browser">