From 5e7a292691951a0fa0a18f06c8b9bcfb509a032d Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Fri, 9 Sep 2011 22:26:16 +0200
Subject: Various JavaScript improvements, JSLint, jQuery
---
lib/exe/js.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
(limited to 'lib/exe/js.php')
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 33f8c695d..b7f2fd222 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -88,6 +88,7 @@ function js_out(){
// add some global variables
print "var DOKU_BASE = '".DOKU_BASE."';";
print "var DOKU_TPL = '".DOKU_TPL."';";
+ // FIXME: Move those to JSINFO
print "var DOKU_UHN = ".((int) useHeading('navigation')).";";
print "var DOKU_UHC = ".((int) useHeading('content')).";";
@@ -106,10 +107,7 @@ function js_out(){
echo "\n\n/* XXXXXXXXXX end of " . str_replace(DOKU_INC, '', $file) . " XXXXXXXXXX */\n\n";
}
-
// init stuff
- js_runonstart("addEvent(document,'click',closePopups)");
- js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)");
if($conf['locktime'] != 0){
js_runonstart("dw_locktimer.init(".($conf['locktime'] - 60).",".$conf['usedraft'].")");
}
@@ -220,7 +218,7 @@ function js_escape($string){
* @author Andreas Gohr <andi@splitbrain.org>
*/
function js_runonstart($func){
- echo "addInitEvent(function(){ $func; });".NL;
+ echo "jQuery(function(){ $func; });".NL;
}
/**
--
cgit v1.2.3