From da15c140f7cc408a5c92f69edc77e18457728afd Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 28 Feb 2013 20:21:06 +0400 Subject: only bind noscroll hotkeys in combined mode by default --- include/functions.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/functions.php b/include/functions.php index 8db72f56d..b381ff1ea 100644 --- 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); -- cgit v1.2.3