diff options
| author | lupo49 <post@lupo49.de> | 2011-11-12 16:22:44 +0100 |
|---|---|---|
| committer | lupo49 <post@lupo49.de> | 2011-11-12 16:22:44 +0100 |
| commit | fe9851b94f1bfe4014cf48043b4609def611a3ee (patch) | |
| tree | 2362c48e0526f2254bb80a70db107b3032736a80 /lib/exe/js.php | |
| parent | 1614eb9180008daaf518e6271b82222219efc008 (diff) | |
| parent | 2c961e6163b23ef3f1d93b1b0c23b214f3aeb358 (diff) | |
| download | rpg-fe9851b94f1bfe4014cf48043b4609def611a3ee.tar.gz rpg-fe9851b94f1bfe4014cf48043b4609def611a3ee.tar.bz2 | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'lib/exe/js.php')
| -rw-r--r-- | lib/exe/js.php | 6 |
1 files changed, 2 insertions, 4 deletions
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; } /** |