diff options
| author | Kate Arzamastseva <pshns@ukr.net> | 2011-08-25 15:01:15 +0300 |
|---|---|---|
| committer | Kate Arzamastseva <pshns@ukr.net> | 2011-08-25 15:01:15 +0300 |
| commit | 47e84e7a9713558efde9ea83063d3e0830651622 (patch) | |
| tree | 8416e23249ee823249a98c8a0fbf88cfe26b80d7 /lib/exe | |
| parent | 80525638759a0bfe0ca5d83d9b06430f0d94c2ac (diff) | |
| parent | 1c5f7481f4e685ad3ffe9ba48ed47ed75196e64a (diff) | |
| download | rpg-47e84e7a9713558efde9ea83063d3e0830651622.tar.gz rpg-47e84e7a9713558efde9ea83063d3e0830651622.tar.bz2 | |
merging
Diffstat (limited to 'lib/exe')
| -rw-r--r-- | lib/exe/js.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index 1ca4fef98..33f8c695d 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -46,7 +46,6 @@ function js_out(){ DOKU_INC."lib/scripts/fileuploader.js", DOKU_INC."lib/scripts/fileuploaderextended.js", DOKU_INC.'lib/scripts/helpers.js', - DOKU_INC.'lib/scripts/events.js', DOKU_INC.'lib/scripts/delay.js', DOKU_INC.'lib/scripts/cookie.js', DOKU_INC.'lib/scripts/script.js', @@ -62,11 +61,11 @@ function js_out(){ 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/compatibility.js', # disabled for FS#1958 DOKU_INC.'lib/scripts/hotkeys.js', - DOKU_TPLINC.'script.js', DOKU_INC.'lib/scripts/behaviour.js', + DOKU_INC.'lib/scripts/page.js', + DOKU_TPLINC.'script.js', ); // add possible plugin scripts and userscript @@ -112,7 +111,7 @@ function js_out(){ js_runonstart("addEvent(document,'click',closePopups)"); js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)"); if($conf['locktime'] != 0){ - js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].", 'wiki__text')"); + js_runonstart("dw_locktimer.init(".($conf['locktime'] - 60).",".$conf['usedraft'].")"); } // init hotkeys - must have been done after init of toolbar # disabled for FS#1958 js_runonstart('initializeHotkeys()'); |