summaryrefslogtreecommitdiff
path: root/lib/exe/js.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2011-06-10 20:26:04 +0200
committerAndreas Gohr <andi@splitbrain.org>2011-06-13 14:26:34 +0200
commit17e2e2545f2fd3607a14238ecee25eb7a605ce84 (patch)
treeb54585710d4867afa3cbc0e33021806d439f31ec /lib/exe/js.php
parent427fd3cc91f3a9d5ccfba4cfad402d45b40cf103 (diff)
downloadrpg-17e2e2545f2fd3607a14238ecee25eb7a605ce84.tar.gz
rpg-17e2e2545f2fd3607a14238ecee25eb7a605ce84.tar.bz2
Moved behavioural functions into it's own object and file
JavaScript functions adding behaviours based on IDs or class names where moved to their own object into behaviour.js and where jQueryized.
Diffstat (limited to 'lib/exe/js.php')
-rw-r--r--lib/exe/js.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php
index e4c5c2ab8..0d4a08ebd 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -60,6 +60,7 @@ function js_out(){
DOKU_INC.'lib/scripts/subscriptions.js',
# disabled for FS#1958 DOKU_INC.'lib/scripts/hotkeys.js',
DOKU_TPLINC.'script.js',
+ DOKU_INC.'lib/scripts/behaviour.js',
);
// add possible plugin scripts and userscript
@@ -121,8 +122,6 @@ function js_out(){
if($conf['locktime'] != 0){
js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].", 'wiki__text')");
}
- js_runonstart('scrollToMarker()');
- js_runonstart('focusMarker()');
// init hotkeys - must have been done after init of toolbar
# disabled for FS#1958 js_runonstart('initializeHotkeys()');