Changeset 11429 for extensions/Autosize/template/header_2_2.tpl

Timestamp:

Jun 19, 2011, 2:03:07 PM (13 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix bugs on height

File:

• extensions/Autosize/template/header_2_2.tpl (modified) (1 diff)

extensions/Autosize/template/header_2_2.tpl

@@ -5 +5 @@
 {/if}
 {* au cas ou jquery non défini  *}
+{combine_script id="conflit_script0" load="header" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js" } 
 {combine_script id="jquery" load="header" path = "themes/default/js/jquery.min.js"}
-{combine_script id="conflit_script0" load="header" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js" require="jquery" }
-{combine_script id="conflit_script"  path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery" }
+
+{if $combine_file}
+{combine_script id="cl_dimensions" path = $AUTOSIZE_PATH|@cat:"js/autosize.dimensions.js" require="jquery"} 
+{combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery,cl_dimensions"   } 
+{else}
+{combine_script id="cl_dimensions" path = $AUTOSIZE_PATH|@cat:"js/autosize.dimensions.js" require="jquery"} 
+{ combine_script id="conflit_script" load="footer" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery,cl_dimensions"} 
+
+{/if}
 {combine_script id="jquery.cluetip" path = "themes/default/js/plugins/jquery.cluetip.js" require="jquery" }
-{combine_script id="autosize.dimensions" path = $AUTOSIZE_PATH|@cat:"js/autosize.dimensions.js" require="jquery,conflit_script0"}
 {combine_script id="autosize.cookie" path = $AUTOSIZE_PATH|@cat:"js/autosize.cookie.js" require="jquery,conflit_script0"}
 
 
-{combine_script id="conflit_script2" load="async" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js" require="jquery" }
+{combine_script id="conflit_script2" load="async" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js" require="jquery,conflit_script" }