quickAddFeed: fix legacy feed_id type being passed to newrule

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

diff --git a/js/tt-rss.js b/js/tt-rss.js
index 4830fd43ef6b2adf7aed34144189b880106f980a..1872ad1ab230157e88472427800a569c655f987a 100644 (file)
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -228,6 +228,7 @@ function init() {
                        "dijit/form/Form",
                        "dijit/form/RadioButton",
                        "dijit/form/Select",
+               "dijit/form/MultiSelect",
                        "dijit/form/SimpleTextarea",
                        "dijit/form/TextBox",
                        "dijit/form/ComboBox",
@@ -851,26 +852,15 @@ function hotkey_handler(e) {
        if (e.target.nodeName == "INPUT" || e.target.nodeName == "TEXTAREA") return;
 
        var keycode = false;
-       var shift_key = false;
-       var ctrl_key = false;
-       var alt_key = false;
-       var meta_key = false;
 
        var cmdline = $('cmdline');
 
-       shift_key = e.shiftKey;
-       ctrl_key = e.ctrlKey;
-       alt_key = e.altKey;
-       meta_key = e.metaKey;
-
        if (window.event) {
                keycode = window.event.keyCode;
        } else if (e) {
                keycode = e.which;
        }
 
-       var keychar = String.fromCharCode(keycode);
-
        if (keycode == 27) { // escape
                hotkey_prefix = false;
        }
@@ -878,9 +868,8 @@ function hotkey_handler(e) {
        if (keycode == 16) return; // ignore lone shift
        if (keycode == 17) return; // ignore lone ctrl
 
-       keychar = keychar.toLowerCase();
-
        var hotkeys = getInitParam("hotkeys");
+       var keychar = String.fromCharCode(keycode).toLowerCase();
 
        if (!hotkey_prefix && hotkeys[0].indexOf(keychar) != -1) {
 
@@ -904,10 +893,10 @@ function hotkey_handler(e) {
        var hotkey = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")";
 
        // ensure ^*char notation
-       if (shift_key) hotkey = "*" + hotkey;
-       if (ctrl_key) hotkey = "^" + hotkey;
-       if (alt_key) hotkey = "+" + hotkey;
-       if (meta_key) hotkey = "%" + hotkey;
+       if (e.shiftKey) hotkey = "*" + hotkey;
+       if (e.ctrlKey) hotkey = "^" + hotkey;
+       if (e.altKey) hotkey = "+" + hotkey;
+       if (e.metaKey) hotkey = "%" + hotkey;
 
        hotkey = hotkey_prefix ? hotkey_prefix + " " + hotkey : hotkey;
        hotkey_prefix = false;