Remove unnecessary NSToolbarItem subclass

Author: dteoh

DevDocs.xcodeproj/project.pbxproj

@@ -22,7 +22,6 @@
 		06B5A73921D3665C007823B2 /* DefaultsKit.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = 06B5A73821D3665C007823B2 /* DefaultsKit.framework.dSYM */; };
 		06B5A73B21D36680007823B2 /* Storage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B5A73A21D36680007823B2 /* Storage.swift */; };
 		06CAA897223E6ACB00B296AC /* URLEventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06CAA896223E6ACB00B296AC /* URLEventHandler.swift */; };
-		06CFC3B8256CE31B00330C5D /* NavigationToolbarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06CFC3B7256CE31B00330C5D /* NavigationToolbarItem.swift */; };
 		06EAE7ED21D0CB3D00F7C921 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06EAE7EC21D0CB3D00F7C921 /* AppDelegate.swift */; };
 		06EAE7EF21D0CB3E00F7C921 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 06EAE7EE21D0CB3E00F7C921 /* Assets.xcassets */; };
 		06EAE7F221D0CB3E00F7C921 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 06EAE7F021D0CB3E00F7C921 /* MainMenu.xib */; };
@@ -72,7 +71,6 @@
 		06B5A73821D3665C007823B2 /* DefaultsKit.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = DefaultsKit.framework.dSYM; path = Carthage/Build/Mac/DefaultsKit.framework.dSYM; sourceTree = "<group>"; };
 		06B5A73A21D36680007823B2 /* Storage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Storage.swift; sourceTree = "<group>"; };
 		06CAA896223E6ACB00B296AC /* URLEventHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLEventHandler.swift; sourceTree = "<group>"; };
-		06CFC3B7256CE31B00330C5D /* NavigationToolbarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationToolbarItem.swift; sourceTree = "<group>"; };
 		06EAE7E921D0CB3D00F7C921 /* DevDocs.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DevDocs.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		06EAE7EC21D0CB3D00F7C921 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		06EAE7EE21D0CB3E00F7C921 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -140,7 +138,6 @@
 				06B5A73021D354FC007823B2 /* DocumentationWindows.swift */,
 				061A0544246E275200CCFC1A /* GeneralPreferences.swift */,
 				06EAE7F021D0CB3E00F7C921 /* MainMenu.xib */,
-				06CFC3B7256CE31B00330C5D /* NavigationToolbarItem.swift */,
 				06996D3A223DEF54001507AD /* PreferencesWindowController.swift */,
 				06996D3B223DEF54001507AD /* PreferencesWindowController.xib */,
 				06B5A73A21D36680007823B2 /* Storage.swift */,
@@ -230,7 +227,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				06996D2D223DDBEB001507AD /* Summoner.swift in Sources */,
-				06CFC3B8256CE31B00330C5D /* NavigationToolbarItem.swift in Sources */,
 				06EAE7FF21D0FA4000F7C921 /* DocumentationViewController.swift in Sources */,
 				06996D3C223DEF54001507AD /* PreferencesWindowController.swift in Sources */,
 				06B5A73121D354FC007823B2 /* DocumentationWindows.swift in Sources */,

devdocs-macos/DocumentationViewController.swift

@@ -105,6 +105,14 @@ class DocumentationViewController: NSViewController {
 
     // MARK:- Navigation
 
+    func canGoBack() -> Bool {
+        return webView.backForwardList.backItem.map { _ in true } ?? false
+    }
+
+    func canGoForward() -> Bool {
+        return webView.backForwardList.forwardItem.map { _ in true } ?? false
+    }
+
     @objc func goBack() {
         webView.evaluateJavaScript("window.history.back();");
     }
@@ -291,16 +299,15 @@ extension DocumentationViewController: NSSearchFieldDelegate {
     }
 }
 
-// MARK:- NavigationToolbarItemDelegate
-extension DocumentationViewController: NavigationToolbarItemDelegate {
-    func canNavigate(_ item: NavigationToolbarItem) -> Bool {
-        switch item.itemIdentifier {
-        case .navigateBack:
-            return webView.backForwardList.backItem.map { _ in true } ?? false
-        case .navigateForward:
-            return webView.backForwardList.forwardItem.map { _ in true } ?? false
-        default:
-            return false;
+// MARK:- NSUserInterfaceValidations
+extension DocumentationViewController: NSUserInterfaceValidations {
+    func validateUserInterfaceItem(_ item: NSValidatedUserInterfaceItem) -> Bool {
+        if item.action == #selector(goBack) {
+            return canGoBack()
+        }
+        if item.action == #selector(goForward) {
+            return canGoForward()
         }
+        return false
     }
 }

devdocs-macos/DocumentationWindowController.swift

@@ -173,7 +173,7 @@ extension DocumentationWindowController: NSToolbarDelegate {
     func toolbar(_ toolbar: NSToolbar, itemForItemIdentifier itemIdentifier: NSToolbarItem.Identifier, willBeInsertedIntoToolbar flag: Bool) -> NSToolbarItem? {
         switch itemIdentifier {
         case .historyNavigation:
-            let backItem = NavigationToolbarItem(itemIdentifier: .navigateBack)
+            let backItem = NSToolbarItem(itemIdentifier: .navigateBack)
             do {
                 backItem.label = NSLocalizedString("Back", comment: "Navigate back")
                 backItem.toolTip = backItem.label
@@ -183,7 +183,7 @@ extension DocumentationWindowController: NSToolbarDelegate {
                 backItem.autovalidates = true
             }
 
-            let forwardItem = NavigationToolbarItem(itemIdentifier: .navigateForward)
+            let forwardItem = NSToolbarItem(itemIdentifier: .navigateForward)
             do {
                 forwardItem.label = NSLocalizedString("Forward", comment: "Navigate forward")
                 forwardItem.toolTip = forwardItem.label
@@ -216,14 +216,12 @@ extension DocumentationWindowController: NSToolbarDelegate {
         case .historyNavigation:
             let itemGroup = item as! NSToolbarItemGroup
             for subitem in itemGroup.subitems {
-                let navigationItem = subitem as! NavigationToolbarItem
-                navigationItem.navigationDelegate = documentationViewController
-                navigationItem.target = documentationViewController
-                switch navigationItem.itemIdentifier {
+                subitem.target = documentationViewController
+                switch subitem.itemIdentifier {
                 case .navigateBack:
-                    navigationItem.action = #selector(DocumentationViewController.goBack)
+                    subitem.action = #selector(DocumentationViewController.goBack)
                 case .navigateForward:
-                    navigationItem.action = #selector(DocumentationViewController.goForward)
+                    subitem.action = #selector(DocumentationViewController.goForward)
                 default:
                     break
                 }
@@ -248,10 +246,8 @@ extension DocumentationWindowController: NSToolbarDelegate {
         case .historyNavigation:
             let itemGroup = item as! NSToolbarItemGroup
             for subitem in itemGroup.subitems {
-                let navigationItem = subitem as! NavigationToolbarItem
-                navigationItem.navigationDelegate = nil
-                navigationItem.target = nil
-                navigationItem.action = nil
+                subitem.target = nil
+                subitem.action = nil
             }
         case .contentSearch:
             contentSearchField = nil