display active hotkey prefix on screen

[tt-rss.git] / tt-rss.js

diff --git a/tt-rss.js b/tt-rss.js
index cb008c10eb75bb45bfbd29cfb22610736ae5707d..408eb3913ed91a55e6c736b0bf41ed3ec98ab6e3 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -314,25 +314,6 @@ function viewfeed(feed, subop) {
        f.viewfeed(feed, subop);
 }
 
-function hotkey_prefix_timeout() {
-       try {
-
-               var date = new Date();
-               var ts = Math.round(date.getTime() / 1000);
-
-               if (hotkey_prefix_pressed && ts - hotkey_prefix_pressed >= 5) {
-                       debug("hotkey_prefix seems to be stuck, aborting");
-                       hotkey_prefix_pressed = false;
-                       hotkey_prefix = false;
-               }
-
-               setTimeout("hotkey_prefix_timeout()", 10);
-
-       } catch  (e) {
-               exception_error("hotkey_prefix_timeout", e);
-       }
-}
-
 function timeout() {
        if (getInitParam("bw_limit") == "1") return;
 
@@ -1060,6 +1041,7 @@ function hotkey_handler(e) {
                var keycode;
                var shift_key = false;
 
+               var cmdline = $('cmdline');
                var feedlist = $('feedList');
 
                try {
@@ -1099,6 +1081,10 @@ function hotkey_handler(e) {
 
                        hotkey_prefix = keycode;
                        hotkey_prefix_pressed = ts;
+
+                       cmdline.innerHTML = keychar;
+                       Element.show(cmdline);
+
                        debug("KP: PREFIX=" + keycode + " CHAR=" + keychar + " TS=" + ts);
                        return true;
                }
@@ -1109,6 +1095,8 @@ function hotkey_handler(e) {
 
                /* Global hotkeys */
 
+               Element.hide(cmdline);
+
                if (!hotkey_prefix) {
 
                        if (keycode == 68 && shift_key) { // d