From 19023f916817c09e2120e13a3e0977dc6ddd32f4 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Mon, 18 Feb 2019 12:38:14 -0800
Subject: [PATCH] Rewire contextual menu in timeline view.

---
 .../Timeline/TimelineContainerViewController.swift   | 12 +++++++++++-
 .../MainWindow/Timeline/TimelineTableView.xib        | 12 ++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/NetNewsWire/MainWindow/Timeline/TimelineContainerViewController.swift b/NetNewsWire/MainWindow/Timeline/TimelineContainerViewController.swift
index 30527642b..98c7f8d60 100644
--- a/NetNewsWire/MainWindow/Timeline/TimelineContainerViewController.swift
+++ b/NetNewsWire/MainWindow/Timeline/TimelineContainerViewController.swift
@@ -17,6 +17,16 @@ final class TimelineContainerViewController: NSViewController {
 
 	@IBOutlet var containerView: TimelineContainerView!
 
+	var currentTimelineViewController: TimelineViewController? {
+		didSet {
+			let view = currentTimelineViewController?.view
+			if containerView.contentView === view {
+				return
+			}
+			containerView.contentView = view
+		}
+	}
+
 	weak var delegate: TimelineContainerViewControllerDelegate?
 
 	private lazy var regularTimelineViewController = {
@@ -39,7 +49,7 @@ final class TimelineContainerViewController: NSViewController {
 	}
 
 	func showTimeline(_ mode: TimelineSourceMode) {
-		containerView.contentView = timelineViewController(for: mode).view
+		currentTimelineViewController = timelineViewController(for: mode)
 	}
 }
 
diff --git a/NetNewsWire/MainWindow/Timeline/TimelineTableView.xib b/NetNewsWire/MainWindow/Timeline/TimelineTableView.xib
index b77f3dcd5..c547c461b 100644
--- a/NetNewsWire/MainWindow/Timeline/TimelineTableView.xib
+++ b/NetNewsWire/MainWindow/Timeline/TimelineTableView.xib
@@ -43,7 +43,7 @@
                         <connections>
                             <outlet property="dataSource" destination="-2" id="zir-Wd-WsF"/>
                             <outlet property="delegate" destination="-2" id="nbI-3q-mrc"/>
-                            <outlet property="menu" destination="zCu-LD-kHw" id="nNl-iz-nVl"/>
+                            <outlet property="menu" destination="MjV-3b-ZXR" id="kCm-mz-dAV"/>
                         </connections>
                     </tableView>
                 </subviews>
@@ -57,20 +57,20 @@
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
         </scrollView>
-        <menu id="zCu-LD-kHw">
+        <menu id="MjV-3b-ZXR">
             <items>
-                <menuItem title="Item 1" id="AJc-Qw-NnP">
+                <menuItem title="Item 1" id="xfn-qr-Hmg">
                     <modifierMask key="keyEquivalentModifierMask"/>
                 </menuItem>
-                <menuItem title="Item 2" id="YKj-q3-QDG">
+                <menuItem title="Item 2" id="CKG-yd-eyo">
                     <modifierMask key="keyEquivalentModifierMask"/>
                 </menuItem>
-                <menuItem title="Item 3" id="IJ0-IS-a6R">
+                <menuItem title="Item 3" id="SwU-HI-Iqz">
                     <modifierMask key="keyEquivalentModifierMask"/>
                 </menuItem>
             </items>
             <connections>
-                <outlet property="delegate" destination="opA-RM-DKR" id="QpK-G8-xCm"/>
+                <outlet property="delegate" destination="-2" id="t1E-bi-ix5"/>
             </connections>
         </menu>
     </objects>