diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-06-05 11:28:43 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-06-05 11:28:43 +0200 |
| commit | 43576758311bd64506284b15a3a12f153a1c1bc2 (patch) | |
| tree | 9bcb1150b954d36621beaf17a2778e0154ba3939 /lib/exe/js.php | |
| parent | 17582ec6bab09e9d9faf53a93d22ecb4fbf2bb47 (diff) | |
| download | rpg-43576758311bd64506284b15a3a12f153a1c1bc2.tar.gz rpg-43576758311bd64506284b15a3a12f153a1c1bc2.tar.bz2 | |
Updated jQuery-UI, added jQuery updater, load theme in CSS dispatcher
This patch adds a simple shell script to easily update the
jQuery/jQuery-UI+theme bundle to the latest available version.
The jQuery-UI CSS theme is now loaded in lib/exe/css.php (before plugin
and template styles - 3rd party authors can override the styles).
Diffstat (limited to 'lib/exe/js.php')
| -rw-r--r-- | lib/exe/js.php | 13 |
1 files changed, 4 insertions, 9 deletions
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', |