Merge pull request #38 from dteoh/refactoring

Refactoring

Author: dteoh

devdocs-macos/DocumentationViewController.swift

@@ -97,7 +97,7 @@ class DocumentationViewController: NSViewController {
 
     // MARK:- Page search
 
-    @IBAction func searchPageContents(_ sender: NSSearchField) {
+    @objc func searchPageContents(_ sender: NSSearchField) {
         let argsBytes = try! JSONSerialization.data(withJSONObject: ["term": sender.stringValue])
         let args = NSString(data: argsBytes, encoding: String.Encoding.utf8.rawValue)! as String
         webView.evaluateJavaScript("search( (\(args))[\"term\"] );")

devdocs-macos/DocumentationWindowController.swift

@@ -53,8 +53,10 @@ class DocumentationWindowController: NSWindowController {
                                                name: .MenuFindAction,
                                                object: nil)
     }
+}
 
-    private func setupToolbar() {
+private extension DocumentationWindowController {
+    func setupToolbar() {
         let toolbar = NSToolbar(identifier: "DocumentationWindowToolbar")
         toolbar.allowsUserCustomization = true
         toolbar.autosavesConfiguration = true
@@ -68,9 +70,13 @@ class DocumentationWindowController: NSWindowController {
         }
     }
 
+    @objc func openDocumentationInBrowser() {
+        NSWorkspace.shared.open(documentation.url)
+    }
+
     // MARK:- NotificationCenter observers
 
-    @objc private func observeViewerState() {
+    @objc func observeViewerState() {
         guard let dvc = documentationViewController else { return }
 
         if dvc.viewerState != .ready {
@@ -81,22 +87,22 @@ class DocumentationWindowController: NSWindowController {
         dvc.useNativeScrollbars(true)
     }
 
-    @objc private func observeDocumentTitle() {
+    @objc func observeDocumentTitle() {
         guard let dvc = documentationViewController else { return }
         self.window?.title = dvc.documentTitle ?? "DevDocs"
     }
 
-    @objc private func observeDocumentCategory() {
+    @objc func observeDocumentCategory() {
         guard let dvc = documentationViewController else { return }
         self.window?.subtitle = dvc.documentCategory ?? ""
     }
 
-    @objc private func observeDocumentURL() {
+    @objc func observeDocumentURL() {
         guard let dvc = documentationViewController else { return }
         self.documentation.url = dvc.documentURL
     }
 
-    @objc private func observeMenuFindAction() {
+    @objc func observeMenuFindAction() {
         guard let window = self.window else { return }
         if !window.isKeyWindow {
             return
@@ -106,12 +112,6 @@ class DocumentationWindowController: NSWindowController {
     }
 }
 
-private extension DocumentationWindowController {
-    @objc func openDocumentationInBrowser() {
-        NSWorkspace.shared.open(documentation.url)
-    }
-}
-
 // MARK:- DocumentationViewDelegate
 extension DocumentationWindowController: DocumentationViewDelegate {
     func selectFileToOpen(_ parameters: OpenPanelParameters, completionHandler: @escaping ([URL]?) -> Void) {