From 477402d827ef1640405552190cd5cfabd7cabff2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Sat, 17 May 2008 04:22:38 +0100
Subject: [PATCH] remove incomplete code for hotkey zones

---
 functions.js | 57 +++++-----------------------------------------------
 help/4.php   |  1 +
 prefs.js     | 12 +++++++++++
 3 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/functions.js b/functions.js
index f46bc60f0..0a31e7969 100644
--- a/functions.js
+++ b/functions.js
@@ -1,7 +1,6 @@
 var hotkeys_enabled = true;
 var debug_mode_enabled = false;
 var xmlhttp_rpc = Ajax.getTransport();
-var hotkey_zone = 0;
 
 /* add method to remove element from array */
 
@@ -1632,59 +1631,13 @@ function displayHelpInfobox(topic_id) {
 	return false;
 }
 
-var _border_color_normal = "#88b0f0";
-var _border_color_highlight = "#72eda8";
-var _border_color_flash = "#f0fff0";
-
-function highlightHotkeyZone(zone) {
+function focus_element(id) {
 	try {
-		var feeds = document.getElementById("feeds-holder");
-		var headlines = document.getElementById("headlines-frame");
-		var content = document.getElementById("content-frame");
-
-		feeds.style.borderColor = _border_color_normal;
-		headlines.style.borderColor = _border_color_normal;
-		content.style.borderColor = _border_color_normal;
-
-		if (zone == 1) {
-			feeds.style.borderColor = _border_color_highlight;
-
-			new Effect.Highlight(feeds, {duration: 0.5, startcolor: 
-				_border_color_flash,
-				queue: { position:'end', scope: 'EFCHL-Q', limit: 1 } } );
-		}
-
-		if (zone == 2) {
-			headlines.style.borderColor = _border_color_highlight;
-
-			new Effect.Highlight(headlines, {duration: 0.5, startcolor: 
-				_border_color_flash,
-				queue: { position:'end', scope: 'EFCHL-Q', limit: 1 } } );
-		}
-
-		if (zone == 3 && content) {			
-			content.style.borderColor = _border_color_highlight;
-
-			new Effect.Highlight(content, {duration: 0.5, startcolor: 
-				_border_color_flash,
-				queue: { position:'end', scope: 'EFCHL-Q', limit: 1 } } );
-		}
-
+		var e = document.getElementById(id);
+		if (e) e.focus();
 	} catch (e) {
-		exception_error("highlightHotkeyZone", e);
-	}
-}
-
-
-function setHotkeyZone(zone) {
-	try {
-		hotkey_zone = zone;
-
-		highlightHotkeyZone(zone);
-
-
-	} catch (e) {
-		exception_error("setHotkeyZone", e);
+		exception_error(e, "focus_element");
 	}
+	return false;
 }
 
diff --git a/help/4.php b/help/4.php
index d452183f5..fbf6c8f0a 100644
--- a/help/4.php
+++ b/help/4.php
@@ -30,6 +30,7 @@
 	<h2><?php echo __("Other actions") ?></h2>
 
 	<table>
+		<tr><td class='n'>/</td><td><?php echo __("Focus search (if present)") ?></td></tr>
 		<tr><td class='n'>?</td><td><?php echo __("Display this help dialog") ?></td></tr>
 	</table>
 
diff --git a/prefs.js b/prefs.js
index 1e84d7a2e..d1f3fc075 100644
--- a/prefs.js
+++ b/prefs.js
@@ -1756,6 +1756,18 @@ function pref_hotkey_handler(e) {
 				return;
 			}
 
+			if (keycode == 191) { // /
+				var search_boxes = new Array("label_search", 
+					"feed_search", "filter_search", "user_search");
+
+				for (var i = 0; i < search_boxes.length; i++) {
+					var elem = document.getElementById(search_boxes[i]);
+					if (elem) {
+						return focus_element(search_boxes[i]);
+					}
+				}
+
+			}
 		}
 
 		/* Prefix c */