diff options
Diffstat (limited to 'lib/exe')
| -rw-r--r-- | lib/exe/css.php | 2 | ||||
| -rw-r--r-- | lib/exe/js.php | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/lib/exe/css.php b/lib/exe/css.php index 03f900034..e4105b427 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -62,6 +62,8 @@ function css_out(){ $files = array(); // load core styles $files[DOKU_INC.'lib/styles/'.$mediatype.'.css'] = DOKU_BASE.'lib/styles/'; + // load jQuery-UI theme + $files[DOKU_INC.'lib/js/jquery/jquery-ui-theme/smoothness.css'] = DOKU_BASE.'lib/js/jquery/jquery-ui-theme/'; // load plugin styles $files = array_merge($files, css_pluginstyles($mediatype)); // load template styles diff --git a/lib/exe/js.php b/lib/exe/js.php index 5ef3b5801..69bc730ac 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -34,19 +34,14 @@ 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'; + // load minified version for some files + $min = $conf['compress'] ? '.min' : ''; // array of core files $files = array( - $jquery_file_path, + DOKU_INC."lib/scripts/jquery/jquery$min.js"; 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/jquery/jquery-ui$min.js", DOKU_INC.'lib/scripts/helpers.js', DOKU_INC.'lib/scripts/events.js', DOKU_INC.'lib/scripts/delay.js', |