Changeset 28820 for trunk/admin/themes/default

Timestamp:

Jun 28, 2014, 6:32:12 AM (10 years ago)

Author:

rvelices

Message:

fix date picker js dependencies when combine_template_files = false

File:

• trunk/admin/themes/default/template/include/datepicker.inc.tpl (modified) (1 diff)

trunk/admin/themes/default/template/include/datepicker.inc.tpl

@@ -1 +1 @@
 {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"}