From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Mon, 19 May 2008 06:37:55 +0000 (+0100)
Subject: map inline search to |
X-Git-Tag: 1.2.23-final~57
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=abe6d9346ea8a9cbbed7d11ec6f7a28183df04e9;p=tt-rss.git

map inline search to |
---

diff --git a/functions.php b/functions.php
index fcbfe40f..698efeb2 100644
--- a/functions.php
+++ b/functions.php
@@ -3939,7 +3939,7 @@
 			print "<td class=\"headlineTitle$rtl_cpart\">";
 
 			print "<span id=\"subtoolbar_search\" 
-				style=\"display : none\">Search: <input 
+				style=\"display : none\"><input 
 				id=\"subtoolbar_search_box\"
 				onblur=\"javascript:enableHotkeys();\" 
 				onfocus=\"javascript:disableHotkeys();\"
diff --git a/tt-rss.js b/tt-rss.js
index f1fe9699..247dca2a 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -1106,6 +1106,18 @@ function hotkey_handler(e) {
 				}
 			}
 
+			if (keycode == 220 && shift_key) { // shift + |
+				if (document.getElementById("subtoolbar_search")) {
+					if (Element.visible("subtoolbar_search")) {
+						Element.hide("subtoolbar_search");
+						Element.show("subtoolbar_ftitle");
+						setTimeout("Element.focus('subtoolbar_search_box')", 100);
+					} else {
+							Element.show("subtoolbar_search");
+						Element.hide("subtoolbar_ftitle");
+					}
+				}
+			}
 		}
 
 		/* Prefix f */
diff --git a/viewfeed.js b/viewfeed.js
index ce8a14fa..da03a6a2 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -1836,7 +1836,6 @@ function fixHeadlinesOrder(ids) {
 }
 
 function subtoolbarSearch() {
-
 	try {
 
 		var q = document.getElementById("subtoolbar_search_box");
@@ -1871,7 +1870,7 @@ function subtoolbarSearch() {
 
 	} catch (e) {
 		exception_error("subtoolbarSearch", e);
-	}
+	} 
 }
 
 function getArticleUnderPointer() {