From 1e1fc06e7b913bcc90a0e7e20d24f9f90e966e8d Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Wed, 20 May 2020 19:59:05 -0500 Subject: [PATCH] Clean up shift-key checking and add it to more places --- Mac/MainWindow/Detail/DetailWebViewController.swift | 2 +- Mac/MainWindow/MainWindowController.swift | 4 +--- Mac/MainWindow/Sidebar/SidebarViewController.swift | 2 +- Mac/MainWindow/Timeline/TimelineViewController.swift | 4 +--- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Mac/MainWindow/Detail/DetailWebViewController.swift b/Mac/MainWindow/Detail/DetailWebViewController.swift index 8b4cdfc08..cadca1150 100644 --- a/Mac/MainWindow/Detail/DetailWebViewController.swift +++ b/Mac/MainWindow/Detail/DetailWebViewController.swift @@ -193,7 +193,7 @@ extension DetailWebViewController: WKNavigationDelegate { public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) { if navigationAction.navigationType == .linkActivated { if let url = navigationAction.request.url { - Browser.open(url.absoluteString) + Browser.open(url.absoluteString, invertPreference: navigationAction.modifierFlags.contains(.shift)) } decisionHandler(.cancel) return diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift index 60e25f3e6..4b5da5479 100644 --- a/Mac/MainWindow/MainWindowController.swift +++ b/Mac/MainWindow/MainWindowController.swift @@ -264,10 +264,8 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations { } @IBAction func openArticleInBrowser(_ sender: Any?) { - let invert = NSApp.currentEvent?.modifierFlags.contains(.shift) ?? false - if let link = currentLink { - Browser.open(link, invertPreference: invert) + Browser.open(link, invertPreference: NSApp.currentEvent?.modifierFlags.contains(.shift) ?? false) } } diff --git a/Mac/MainWindow/Sidebar/SidebarViewController.swift b/Mac/MainWindow/Sidebar/SidebarViewController.swift index b268be44f..7cb181d39 100644 --- a/Mac/MainWindow/Sidebar/SidebarViewController.swift +++ b/Mac/MainWindow/Sidebar/SidebarViewController.swift @@ -237,7 +237,7 @@ protocol SidebarDelegate: class { guard let feed = singleSelectedWebFeed, let homePageURL = feed.homePageURL else { return } - Browser.open(homePageURL) + Browser.open(homePageURL, invertPreference: NSApp.currentEvent?.modifierFlags.contains(.shift) ?? false) } @IBAction func gotoToday(_ sender: Any?) { diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/TimelineViewController.swift index 3049653df..a283ebd41 100644 --- a/Mac/MainWindow/Timeline/TimelineViewController.swift +++ b/Mac/MainWindow/Timeline/TimelineViewController.swift @@ -296,10 +296,8 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr // MARK: - Actions @objc func openArticleInBrowser(_ sender: Any?) { - let invert = NSApp.currentEvent?.modifierFlags.contains(.shift) ?? false - if let link = oneSelectedArticle?.preferredLink { - Browser.open(link, invertPreference: invert) + Browser.open(link, invertPreference: NSApp.currentEvent?.modifierFlags.contains(.shift) ?? false) } }