summaryrefslogtreecommitdiff
path: root/lib/exe
diff options
context:
space:
mode:
Diffstat (limited to 'lib/exe')
-rw-r--r--lib/exe/js.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 645ab3cc4..f953aae9e 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -34,8 +34,18 @@ 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-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',
@@ -44,7 +54,6 @@ function js_out(){
DOKU_INC.'lib/scripts/tw-sack.js',
DOKU_INC.'lib/scripts/ajax.js',
DOKU_INC.'lib/scripts/index.js',
- DOKU_INC.'lib/scripts/drag.js',
DOKU_INC.'lib/scripts/textselection.js',
DOKU_INC.'lib/scripts/toolbar.js',
DOKU_INC.'lib/scripts/edit.js',