summaryrefslogtreecommitdiff
path: root/lib/exe/js.php
diff options
context:
space:
mode:
authorMichael Hamann <michael@content-space.de>2011-05-29 22:57:55 +0200
committerMichael Hamann <michael@content-space.de>2011-05-29 23:08:38 +0200
commit79344f5bffd7dfe74cbfe5e4362425dda4f5b7af (patch)
tree178492676b091c03ec52f3a99ad0d089447df823 /lib/exe/js.php
parent5ff127375bd2292958b989dcec18dbca5a8a751f (diff)
parent61a2640a5e066cac3e06f2673c63622d59da2e8d (diff)
downloadrpg-79344f5bffd7dfe74cbfe5e4362425dda4f5b7af.tar.gz
rpg-79344f5bffd7dfe74cbfe5e4362425dda4f5b7af.tar.bz2
Merge branch 'jquery'
Conflicts: lib/scripts/edit.js lib/scripts/locktimer.js Some whitespace (at end of line) cleanup
Diffstat (limited to 'lib/exe/js.php')
-rw-r--r--lib/exe/js.php11
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',