diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-10-27 20:53:59 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-10-27 20:53:59 +0200 |
| commit | 55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8 (patch) | |
| tree | 1bf1359fee6044a704ac8465753e3c147d61e6e3 /lib/exe/js.php | |
| parent | e8b9cf5ae263f3b97aaa389dddd9e7458cc0894c (diff) | |
| parent | baef77a2b52933a6dd7caf3f641ff5ce6e6164f3 (diff) | |
| download | rpg-55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8.tar.gz rpg-55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'lib/exe/js.php')
| -rw-r--r-- | lib/exe/js.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index 3756c43b9..f9682e1e9 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -51,7 +51,7 @@ function js_out(){ DOKU_INC.'lib/scripts/linkwiz.js', DOKU_INC.'lib/scripts/media.js', DOKU_INC.'lib/scripts/subscriptions.js', - DOKU_INC.'lib/scripts/hotkeys.js', +# disabled for FS#1958 DOKU_INC.'lib/scripts/hotkeys.js', DOKU_TPLINC.'script.js', ); @@ -117,7 +117,7 @@ function js_out(){ js_runonstart('scrollToMarker()'); js_runonstart('focusMarker()'); // init hotkeys - must have been done after init of toolbar - js_runonstart('initializeHotkeys()'); +# disabled for FS#1958 js_runonstart('initializeHotkeys()'); // end output buffering and get contents $js = ob_get_contents(); |