summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2010-06-26 13:54:29 +0200
committerAndreas Gohr <andi@splitbrain.org>2010-06-26 13:54:29 +0200
commit7e1f9fd36044e5c651c71348897a3a3dc103d15a (patch)
treed28fb36043518eab3183672b1a482feeb54840bf
parent8d22f1e96be5aa2c65ecb6ee934debbfe0f8f4cc (diff)
downloadrpg-7e1f9fd36044e5c651c71348897a3a3dc103d15a.tar.gz
rpg-7e1f9fd36044e5c651c71348897a3a3dc103d15a.tar.bz2
Hotkey trigger is now CTRL-ALT FS#1958
Tests and feedbacks please!
-rw-r--r--lib/exe/js.php2
-rw-r--r--lib/scripts/hotkeys.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 669afb96c..f2f9dfe6b 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -114,7 +114,7 @@ function js_out(){
js_runonstart('scrollToMarker()');
js_runonstart('focusMarker()');
// init hotkeys - must have been done after init of toolbar
-#FIXME disabled for FS#1958 js_runonstart('initializeHotkeys()');
+ js_runonstart('initializeHotkeys()');
// end output buffering and get contents
$js = ob_get_contents();
diff --git a/lib/scripts/hotkeys.js b/lib/scripts/hotkeys.js
index 2b696e78d..2b6fb6d96 100644
--- a/lib/scripts/hotkeys.js
+++ b/lib/scripts/hotkeys.js
@@ -18,7 +18,7 @@ function Hotkeys() {
* this.modifier = 'alt';
* this.modifier = 'alt+shift';
*/
- this.modifier = 'alt';
+ this.modifier = 'ctrl+alt';
/**
* Initialization