From 834be9edff6e78c4116a3c1ac74458b5f463fba4 Mon Sep 17 00:00:00 2001
From: Martin Nash <mnash@starbucks.com>
Date: Wed, 20 May 2020 21:51:41 -0700
Subject: [PATCH 1/2] 2099 | Keyboard shortcut to open in browser in
 background/foreground contrary to user preference.

- Add openInBrowserAlternate() function
- Add shit-modified entries to to GlobalKeyboardShortcuts.plist to trigger new function
---
 Mac/MainWindow/MainWindowController.swift     |  6 +++++
 .../Resources/GlobalKeyboardShortcuts.plist   | 24 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift
index 01e7335c2..690b57c83 100644
--- a/Mac/MainWindow/MainWindowController.swift
+++ b/Mac/MainWindow/MainWindowController.swift
@@ -269,6 +269,12 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 		openArticleInBrowser(sender)
 	}
 
+	@IBAction func openInBrowserAlternate(_ sender: Any?) {
+		if let link = currentLink {
+			Browser.open(link, inBackground: !AppDefaults.openInBrowserInBackground)
+		}
+	}
+
 	@IBAction func nextUnread(_ sender: Any?) {
 		guard let timelineViewController = currentTimelineViewController, let sidebarViewController = sidebarViewController else {
 			return
diff --git a/Shared/Resources/GlobalKeyboardShortcuts.plist b/Shared/Resources/GlobalKeyboardShortcuts.plist
index 88e4eac90..8b2bb170e 100644
--- a/Shared/Resources/GlobalKeyboardShortcuts.plist
+++ b/Shared/Resources/GlobalKeyboardShortcuts.plist
@@ -140,5 +140,29 @@
 		<key>action</key>
 		<string>toggleStarred:</string>
 	</dict>
+	<dict>
+		<key>key</key>
+		<string>[enter]</string>
+		<key>shiftModifier</key>
+		<true/>
+		<key>action</key>
+		<string>openInBrowserAlternate:</string>
+	</dict>
+	<dict>
+		<key>key</key>
+		<string>[return]</string>
+		<key>shiftModifier</key>
+		<true/>
+		<key>action</key>
+		<string>openInBrowserAlternate:</string>
+	</dict>
+	<dict>
+		<key>key</key>
+		<string>B</string>
+		<key>shiftModifier</key>
+		<true/>
+		<key>action</key>
+		<string>openInBrowserAlternate:</string>
+	</dict>
 </array>
 </plist>

From 3e48be050e80fc680a0b02ded252ecc4e24a7991 Mon Sep 17 00:00:00 2001
From: Martin Nash <mnash@starbucks.com>
Date: Thu, 21 May 2020 22:28:21 -0700
Subject: [PATCH 2/2] Updated function name to
 openInBrowserUsingOppositeOfSettings

---
 Mac/MainWindow/MainWindowController.swift      | 2 +-
 Shared/Resources/GlobalKeyboardShortcuts.plist | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift
index 690b57c83..f7de9c485 100644
--- a/Mac/MainWindow/MainWindowController.swift
+++ b/Mac/MainWindow/MainWindowController.swift
@@ -269,7 +269,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 		openArticleInBrowser(sender)
 	}
 
-	@IBAction func openInBrowserAlternate(_ sender: Any?) {
+	@IBAction func openInBrowserUsingOppositeOfSettings(_ sender: Any?) {
 		if let link = currentLink {
 			Browser.open(link, inBackground: !AppDefaults.openInBrowserInBackground)
 		}
diff --git a/Shared/Resources/GlobalKeyboardShortcuts.plist b/Shared/Resources/GlobalKeyboardShortcuts.plist
index 8b2bb170e..0101a9a6b 100644
--- a/Shared/Resources/GlobalKeyboardShortcuts.plist
+++ b/Shared/Resources/GlobalKeyboardShortcuts.plist
@@ -146,7 +146,7 @@
 		<key>shiftModifier</key>
 		<true/>
 		<key>action</key>
-		<string>openInBrowserAlternate:</string>
+		<string>openInBrowserUsingOppositeOfSettings:</string>
 	</dict>
 	<dict>
 		<key>key</key>
@@ -154,7 +154,7 @@
 		<key>shiftModifier</key>
 		<true/>
 		<key>action</key>
-		<string>openInBrowserAlternate:</string>
+		<string>openInBrowserUsingOppositeOfSettings:</string>
 	</dict>
 	<dict>
 		<key>key</key>
@@ -162,7 +162,7 @@
 		<key>shiftModifier</key>
 		<true/>
 		<key>action</key>
-		<string>openInBrowserAlternate:</string>
+		<string>openInBrowserUsingOppositeOfSettings:</string>
 	</dict>
 </array>
 </plist>