view search will focus on the search input if you're already on that …

…page
jcsalterego · Dec 21, 2024 · b62ef3a · b62ef3a
1 parent 701ec77
commit b62ef3a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/Sky/Scripts.swift b/Sky/Scripts.swift
@@ -49,4 +49,10 @@ class Scripts {
         )
     }
 
+    static func focusSearch() -> String {
+        return JsLoader.loadScriptContents(
+            "Scripts/focus_search", [:]
+        )
+    }
+
 }
diff --git a/Sky/ViewController.swift b/Sky/ViewController.swift
@@ -143,14 +143,18 @@ class ViewController: NSViewController {
     }
 
     @IBAction func actionViewSearch(_ sender: Any?) {
-        self.webView.evaluateJavaScript(
-            Scripts.navigateNavbar(
-                checkLoadNew: false,
-                label: "Search",
-                index: 1,
-                url: SkyUrls.search
+        if webView.url!.absoluteString == SkyUrls.search {
+            self.webView.evaluateJavaScript(Scripts.focusSearch())
+        } else {
+            self.webView.evaluateJavaScript(
+                Scripts.navigateNavbar(
+                    checkLoadNew: false,
+                    label: "Search",
+                    index: 1,
+                    url: SkyUrls.search
+                )
             )
-        )
+        }
     }
 
     @IBAction func actionViewFeeds(_ sender: Any?) {