diff options
Diffstat (limited to 'themes')
-rw-r--r-- | themes/default/template/header.tpl | 2 | ||||
-rw-r--r-- | themes/default/template/include/autosize.inc.tpl | 21 | ||||
-rw-r--r-- | themes/default/template/include/resize.inc.tpl | 9 |
3 files changed, 13 insertions, 19 deletions
diff --git a/themes/default/template/header.tpl b/themes/default/template/header.tpl index 45152d206..5dc51f97b 100644 --- a/themes/default/template/header.tpl +++ b/themes/default/template/header.tpl @@ -30,9 +30,7 @@ {if isset($last.U_IMG) }<link rel="last" title="{'Last'|@translate}" href="{$last.U_IMG}" >{/if} {if isset($U_UP) }<link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >{/if} - {get_combined_css} - {foreach from=$themes item=theme} {if $theme.load_css} {combine_css path="themes/`$theme.id`/theme.css" order=-10} diff --git a/themes/default/template/include/autosize.inc.tpl b/themes/default/template/include/autosize.inc.tpl index 8f5c78c70..ea18e6d3a 100644 --- a/themes/default/template/include/autosize.inc.tpl +++ b/themes/default/template/include/autosize.inc.tpl @@ -1,13 +1,10 @@ -{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"} -{known_script id="jquery.autogrow" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.autogrow-textarea.js"} - +{combine_script id='jquery' load='async' path='themes/default/js/jquery.packed.js'} +{combine_script id='jquery.autogrow' load='async' require='jquery' path='themes/default/js/plugins/jquery.autogrow-textarea.js'} {* Auto size and auto grow textarea *} -{literal} -<script type="text/javascript"> - jQuery().ready(function(){ - jQuery('textarea').css('overflow-y', 'hidden'); - // Auto size and auto grow for all text area - jQuery('textarea').autogrow(); - }); -</script> -{/literal} +{footer_script require='jquery.autogrow'}{literal} +jQuery(document).ready(function(){ + jQuery('textarea').css('overflow-y', 'hidden'); + // Auto size and auto grow for all text area + jQuery('textarea').autogrow(); +}); +{/literal}{/footer_script}
\ No newline at end of file diff --git a/themes/default/template/include/resize.inc.tpl b/themes/default/template/include/resize.inc.tpl index 5165f49a5..b7076a752 100644 --- a/themes/default/template/include/resize.inc.tpl +++ b/themes/default/template/include/resize.inc.tpl @@ -1,9 +1,9 @@ -{combine_script id='jquery' load='footer' path='themes/default/js/jquery.packed.js'} -{combine_script id='jquery.ui' load='footer' require='jquery' path='themes/default/js/ui/packed/ui.core.packed.js'} -{combine_script id='jquery.ui.resizable' load='footer' require='jquery.ui' path='themes/default/js/ui/packed/ui.resizable.packed.js'} +{combine_script id='jquery' load='async' path='themes/default/js/jquery.packed.js'} +{combine_script id='jquery.ui' load='async' require='jquery' path='themes/default/js/ui/packed/ui.core.packed.js'} +{combine_script id='jquery.ui.resizable' load='async' require='jquery.ui' path='themes/default/js/ui/packed/ui.resizable.packed.js'} {* Resize possible *} -{footer_script}{literal} +{footer_script require='jquery.ui.resizable'}{literal} jQuery().ready(function(){ // Resize possible for list jQuery(".categoryList").resizable({ @@ -18,4 +18,3 @@ }); }); {/literal}{/footer_script} - |