From bbd63f0088fe3ee5ea491ac5da03d8b68b5b1a0b Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Sat, 4 Dec 2010 20:32:44 +0000
Subject: trunk admin theme goes with combine_script instead of old style
 known_script

git-svn-id: http://piwigo.org/svn/trunk@7995 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 themes/default/template/include/autosize.inc.tpl | 21 +++++++++------------
 themes/default/template/include/resize.inc.tpl   |  9 ++++-----
 2 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'themes/default/template/include')

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}
-
-- 
cgit v1.2.3