diff --git a/include/functions.php b/include/functions.php index ccf79809..68e744c4 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1895,7 +1895,8 @@ "feed_reverse" => __("Reverse headlines"), "feed_debug_update" => __("Debug feed update"), "catchup_all" => __("Mark all feeds as read"), - "cat_toggle_collapse" => __("Un/collapse current category")), + "cat_toggle_collapse" => __("Un/collapse current category"), + "toggle_combined_mode" => __("Toggle combined mode")), __("Go to") => array( "goto_all" => __("All articles"), "goto_fresh" => __("Fresh"), @@ -1955,6 +1956,7 @@ "f q" => "feed_catchup", "f x" => "feed_reverse", "f D" => "feed_debug_update", + "f C" => "toggle_combined_mode", "Q" => "catchup_all", "x" => "cat_toggle_collapse", // "goto" => array( diff --git a/js/tt-rss.js b/js/tt-rss.js index 054ccf3d..badfe870 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -775,6 +775,19 @@ function hotkey_handler(e) { return false; case "help_dialog": helpDialog("main"); + return false; + case "toggle_combined_mode": + notify_progress("Loading, please wait..."); + + var value = isCdmMode() ? "false" : "true"; + var query = "?op=rpc&method=setpref&key=COMBINED_DISPLAY_MODE&value=" + value; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + window.location.reload(); + } }); + return false; default: console.log("unhandled action: " + hotkey_action + "; hotkey: " + hotkey);