summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-02-28 20:21:06 +0400
committerAndrew Dolgov <[email protected]>2013-02-28 20:21:06 +0400
commitda15c140f7cc408a5c92f69edc77e18457728afd (patch)
tree7e183513e73ba80750a91c8060243c1db1ec9b70
parentf6a260c65ed0afeeee09b503ec88d3244f00a1e9 (diff)
only bind noscroll hotkeys in combined mode by default
-rw-r--r--include/functions.php9
1 files 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);