fix date picker js dependencies when combine_template_files = false

git-svn-id: http://piwigo.org/svn/trunk@28820 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Jun 28, 2014 · e792b70 · e792b70
1 parent 5bc5788
commit e792b70
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/admin/themes/default/template/include/datepicker.inc.tpl b/admin/themes/default/template/include/datepicker.inc.tpl
@@ -1,17 +1,21 @@
 {if empty($load_mode)}{$load_mode='footer'}{/if}
 {combine_script id='jquery.ui.timepicker-addon' load=$load_mode require='jquery.ui.datepicker,jquery.ui.slider' path="themes/default/js/ui/jquery.ui.timepicker-addon.js"}
-{combine_script id='datepicker' load=$load_mode require='jquery.ui.timepicker-addon' path='admin/themes/default/js/datepicker.js'}
 
+{$require='jquery.ui.timepicker-addon'}
 {assign var="datepicker_language" value="themes/default/js/ui/i18n/jquery.ui.datepicker-`$lang_info.code`.js"}
 {if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
-{combine_script id="jquery.ui.datepicker-$lang_info.code" load=$load_mode require='jquery.ui.datepicker' path=$datepicker_language}
+{combine_script id="jquery.ui.datepicker-`$lang_info.code`" load=$load_mode require='jquery.ui.datepicker' path=$datepicker_language}
+{$require=$require|cat:",jquery.ui.datepicker-`$lang_info.code`"}
 {/if}
 
 {assign var="timepicker_language" value="themes/default/js/ui/i18n/jquery.ui.timepicker-`$lang_info.code`.js"}
 {if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
-{combine_script id="jquery.ui.timepicker-$lang_info.code" load=$load_mode require='jquery.ui.timepicker-addon' path=$timepicker_language}
+{combine_script id="jquery.ui.timepicker-`$lang_info.code`" load=$load_mode require='jquery.ui.timepicker-addon' path=$timepicker_language}
+{$require=$require|cat:",jquery.ui.timepicker-`$lang_info.code`"}
 {/if}
 
+{combine_script id='datepicker' load=$load_mode require=$require path='admin/themes/default/js/datepicker.js'}
+
 {combine_css path="themes/default/js/ui/theme/jquery.ui.theme.css"}
 {combine_css path="themes/default/js/ui/theme/jquery.ui.slider.css"}
 {combine_css path="themes/default/js/ui/theme/jquery.ui.datepicker.css"}