diff options
| author | Kate Arzamastseva <pshns@ukr.net> | 2011-06-04 18:59:05 +0300 |
|---|---|---|
| committer | Kate Arzamastseva <pshns@ukr.net> | 2011-06-04 18:59:05 +0300 |
| commit | 8d56551e75f273694893a29a06d8164d3d60ae17 (patch) | |
| tree | 80c181cbb7b4df28fe7691a2dd48fd6761dbe785 /lib/exe | |
| parent | e4f389ef1728a0f86164a0e4b88626be9860dabb (diff) | |
| parent | 0f80b0bcd4ca247f7bc4c3830946741546ad6e88 (diff) | |
| download | rpg-8d56551e75f273694893a29a06d8164d3d60ae17.tar.gz rpg-8d56551e75f273694893a29a06d8164d3d60ae17.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into media-revisions
Diffstat (limited to 'lib/exe')
| -rw-r--r-- | lib/exe/js.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index b2ae3f7fe..a3efff700 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -34,8 +34,19 @@ 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/jquery/jquery.cookie.js', + DOKU_INC.'lib/scripts/jquery-ui/jquery-ui.core.min.js', + DOKU_INC.'lib/scripts/jquery-ui/jquery-ui.interactions.min.js', DOKU_INC.'lib/scripts/helpers.js', DOKU_INC.'lib/scripts/events.js', DOKU_INC.'lib/scripts/delay.js', |