diff options
| author | Pierre Spring <pierre.spring@caillou.ch> | 2010-09-17 15:13:37 +0200 |
|---|---|---|
| committer | Pierre Spring <pierre.spring@caillou.ch> | 2010-10-10 17:29:20 +0200 |
| commit | 2d6262c1145c5937afa14d66b5203c84393df679 (patch) | |
| tree | 43327c39d7d68f72f992cdb369baa899bf95069d /lib/exe/js.php | |
| parent | 4ea48b361401e136dbfd3339af368ceeb5b27480 (diff) | |
| download | rpg-2d6262c1145c5937afa14d66b5203c84393df679.tar.gz rpg-2d6262c1145c5937afa14d66b5203c84393df679.tar.bz2 | |
loading jQuery and putting it into noConflict mode
Diffstat (limited to 'lib/exe/js.php')
| -rw-r--r-- | lib/exe/js.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index 3756c43b9..c916bf85d 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -34,8 +34,16 @@ function js_out(){ // The generated script depends on some dynamic options $cache = getCacheName('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js'); + // load jQuery, minified if compression is eanbled. + $jquery_file_path = DOKU_INC.'lib/scripts/jquery/jquery'; + if($conf['compress']) { + $jquery_file_path .= '.min'; + } + $jquery_file_path .= '.js'; + // array of core files $files = array( + $jquery_file_path, DOKU_INC.'lib/scripts/helpers.js', DOKU_INC.'lib/scripts/events.js', DOKU_INC.'lib/scripts/delay.js', |