only bind noscroll hotkeys in combined mode by default

diff --git a/include/functions.php b/include/functions.php
index 8db72f56de3ec1bac5c1d22bae2248599ded507d..b381ff1ea56e29ec2c15cc321a2c17112f7cab25 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1921,8 +1921,8 @@
                                "p" => "prev_article",
                                "(38)|up" => "prev_article",
                                "(40)|down" => "next_article",
-                               "^(38)|Ctrl-up" => "prev_article_noscroll",
-                               "^(40)|Ctrl-down" => "next_article_noscroll",
+//                             "^(38)|Ctrl-up" => "prev_article_noscroll",
+//                             "^(40)|Ctrl-down" => "next_article_noscroll",
                                "(191)|/" => "search_dialog",
 //                     "article" => array(
                                "s" => "toggle_mark",
@@ -1971,6 +1971,11 @@
                                "^(191)|Ctrl+/" => "help_dialog",
                        );
 
+               if (get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+                       $hotkeys["^(38)|Ctrl-up"] = "prev_article_noscroll";
+                       $hotkeys["^(40)|Ctrl-down"] = "next_article_noscroll";
+               }
+
                global $pluginhost;
                foreach ($pluginhost->get_hooks($pluginhost::HOOK_HOTKEY_MAP) as $plugin) {
                        $hotkeys = $plugin->hook_hotkey_map($hotkeys);