diff options
author | Andreas Gohr <andi@splitbrain.org> | 2014-02-02 12:38:22 -0800 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2014-02-02 12:38:22 -0800 |
commit | 69736a139a14ee8cb2a439b34d64f964a0519a03 (patch) | |
tree | 1ea14bc2aeae52c2fea54adde609806f89bfc7ac /lib/exe | |
parent | 8f8f057a71acccc5537691d6437a3651e68a2ebc (diff) | |
parent | 4d4058eec6b089a303975dfd71f16fd42f55f11b (diff) | |
download | rpg-69736a139a14ee8cb2a439b34d64f964a0519a03.tar.gz rpg-69736a139a14ee8cb2a439b34d64f964a0519a03.tar.bz2 |
Merge pull request #503 from splitbrain/datepickerlocale
localize jQuery UI date picker FS#2912
Diffstat (limited to 'lib/exe')
-rw-r--r-- | lib/exe/js.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index 040b8874d..04413b409 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -44,6 +44,7 @@ function js_out(){ DOKU_INC.'lib/scripts/jquery/jquery.cookie.js', DOKU_INC."lib/scripts/jquery/jquery-ui$min.js", DOKU_INC."lib/scripts/jquery/jquery-migrate$min.js", + DOKU_INC.'inc/lang/'.$conf['lang'].'/jquery.ui.datepicker.js', DOKU_INC."lib/scripts/fileuploader.js", DOKU_INC."lib/scripts/fileuploaderextended.js", DOKU_INC.'lib/scripts/helpers.js', @@ -112,6 +113,7 @@ function js_out(){ // load files foreach($files as $file){ + if(!file_exists($file)) continue; $ismin = (substr($file,-7) == '.min.js'); $debugjs = ($conf['allowdebug'] && strpos($file, DOKU_INC.'lib/scripts/') !== 0); |