diff options
| author | Michal Rezler <rezlemic@fel.cvut.cz> | 2011-03-23 10:39:45 +0100 |
|---|---|---|
| committer | Michal Rezler <rezlemic@fel.cvut.cz> | 2011-03-23 10:39:45 +0100 |
| commit | 35838d22a57707952f630eaf9f9e9ab4c6c3cfb0 (patch) | |
| tree | 3603e2e56314af40a4b7922e14e52c0bc06f6f9d /lib/exe/js.php | |
| parent | c4bb7947fcb2d4a5e5f8a15d9e3bbec333e44e13 (diff) | |
| parent | ee1214abb2c14cf0f86ff6d9a5b49536c6b01e18 (diff) | |
| download | rpg-35838d22a57707952f630eaf9f9e9ab4c6c3cfb0.tar.gz rpg-35838d22a57707952f630eaf9f9e9ab4c6c3cfb0.tar.bz2 | |
jQuery rewrite branch merged into master branch of whole project
Diffstat (limited to 'lib/exe/js.php')
| -rw-r--r-- | lib/exe/js.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index 59d1ded2c..f953aae9e 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -57,10 +57,11 @@ function js_out(){ DOKU_INC.'lib/scripts/textselection.js', DOKU_INC.'lib/scripts/toolbar.js', DOKU_INC.'lib/scripts/edit.js', + DOKU_INC.'lib/scripts/locktimer.js', 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', ); @@ -126,7 +127,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(); @@ -405,4 +406,4 @@ function js_compress($s){ return trim($result); } -//Setup VIM: ex: et ts=4 enc=utf-8 : +//Setup VIM: ex: et ts=4 : |