5 files changed, 10 insertions, 23 deletions
diff --git a/admin/themes/default/template/include/autosize.inc.tpl b/admin/themes/default/template/include/autosize.inc.tpl
index e21162f9e..fd2b2ca75 100644
--- a/admin/themes/default/template/include/autosize.inc.tpl
+++ b/admin/themes/default/template/include/autosize.inc.tpl
@@ -1,4 +1,3 @@
-{combine_script id='jquery' load='async' path='themes/default/js/jquery.min.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 *}
 {footer_script require='jquery.autogrow'}{literal}
diff --git a/admin/themes/default/template/include/datepicker.inc.tpl b/admin/themes/default/template/include/datepicker.inc.tpl
index 87359fbf6..d34994d3b 100644
--- a/admin/themes/default/template/include/datepicker.inc.tpl
+++ b/admin/themes/default/template/include/datepicker.inc.tpl
@@ -1,6 +1,3 @@
-{combine_script id='jquery' load='footer' path='themes/default/js/jquery.min.js'}
-{combine_script id='jquery.ui' load='footer' require='jquery' path='themes/default/js/ui/minified/jquery.ui.core.min.js'}
-{combine_script id='jquery.ui.datepicker' load='footer' require='jquery.ui' path='themes/default/js/ui/minified/jquery.ui.datepicker.min.js'}
 {combine_script id='datepicker.js' load='footer' require='jquery.ui.datepicker' path='themes/default/js/datepicker.js'}
 
 {assign var="datepicker_language" value="themes/default/js/ui/i18n/jquery.ui.datepicker-`$lang_info.code`.js"}
@@ -11,7 +8,7 @@
 
 {combine_css path="themes/default/js/ui/theme/jquery.ui.datepicker.css"}
 
-{footer_script}
+{footer_script require='jquery.ui.datepicker,datepicker.js'}
 function pwg_initialization_datepicker(day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date)
 {ldelim}
   return pwg_common_initialization_datepicker(
diff --git a/admin/themes/default/template/include/dbselect.inc.tpl b/admin/themes/default/template/include/dbselect.inc.tpl
index 91b27681d..3f513cd06 100644
--- a/admin/themes/default/template/include/dbselect.inc.tpl
+++ b/admin/themes/default/template/include/dbselect.inc.tpl
@@ -1,6 +1,3 @@
-{combine_script id='jquery' load='async' path='themes/default/js/jquery.min.js'}
-{combine_script id='jquery.ui' load='async' require='jquery' path='themes/default/js/ui/minified/jquery.ui.core.min.js' }
-{combine_script id='jquery.ui.resizable' load='async' require='jquery.ui' path='themes/default/js/ui/minified/jquery.ui.resizable.min.js' }
 {footer_script require='jquery.ui.resizable'}{literal}
 jQuery(document).ready(function(){
 	// Resize possible for double select list
diff --git a/admin/themes/default/template/include/resize.inc.tpl b/admin/themes/default/template/include/resize.inc.tpl
index a8044f6dc..152ee61a2 100644
--- a/admin/themes/default/template/include/resize.inc.tpl
+++ b/admin/themes/default/template/include/resize.inc.tpl
@@ -1,7 +1,3 @@
-{combine_script id='jquery' load='async' path='themes/default/js/jquery.min.js'}
-{combine_script id='jquery.ui' load='async' require='jquery' path='themes/default/js/ui/minified/jquery.ui.core.min.js'}
-{combine_script id='jquery.ui.resizable' load='async' require='jquery.ui' path='themes/default/js/ui/minified/jquery.ui.resizable.min.js'}
-
 {* Resize possible *}
 {footer_script require='jquery.ui.resizable'}{literal}
   jQuery().ready(function(){
diff --git a/admin/themes/default/template/include/tag_selection.inc.tpl b/admin/themes/default/template/include/tag_selection.inc.tpl
index deedb031c..680c6b85e 100644
--- a/admin/themes/default/template/include/tag_selection.inc.tpl
+++ b/admin/themes/default/template/include/tag_selection.inc.tpl
@@ -1,17 +1,15 @@
-{literal}
-<script type="text/javascript">
-$(document).ready(function(){
-  $(".tagSelection label").click(function () {
-    var parent = $(this).parent('li');
-    var checkbox = $(this).children("input[type=checkbox]");
+{footer_script require='jquery'}{literal}
+jQuery(document).ready(function(){
+  jQuery(".tagSelection label").click(function () {
+    var parent = jQuery(this).parent('li');
+    var checkbox = jQuery(this).children("input[type=checkbox]");
 
-    if ($(checkbox).is(':checked')) {
-       $(parent).addClass("tagSelected"); 
+    if (jQuery(checkbox).is(':checked')) {
+      jQuery(parent).addClass("tagSelected"); 
     }
     else {
-       $(parent).removeClass('tagSelected'); 
+      jQuery(parent).removeClass('tagSelected'); 
     }
   });
 });
-</script>
-{/literal}
+{/literal}{/footer_script}