Changeset 10913 for extensions/Autosize/template

Timestamp:

May 17, 2011, 6:43:15 PM (14 years ago)

Author:

cljosse

Message:

[extensions] autosize compatibility with pamooramics & gmaps

Location:

extensions/Autosize/template

Files:

• header_2_2.tpl (modified) (1 diff)
• picture_2_2.tpl (modified) (1 diff)

extensions/Autosize/template/header_2_2.tpl

@@ -1 @@
-{combine_script id="jquery" load="header" path = "themes/default/js/jquery.min.js"}
+{if not empty($pamoorama)}
+
+ <script  id="pamoorama0.3" src="plugins/paMOOramics/js/pamoorama0.3.js" type="text/jscript"></script>
+<script id="mootools" src="plugins/paMOOramics/js/mootools.js" type="text/jscript"></script>
+
+
+{else}{/if}{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" }
 {combine_script id="jquery.cluetip" path = "themes/default/js/plugins/jquery.cluetip.js" require="jquery" }
-{combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery"}
 {combine_script id="autosize.dimensions" path = $AUTOSIZE_PATH|@cat:"js/autosize.dimensions.js" require="jquery"}
 {combine_script id="autosize.cookie" path = $AUTOSIZE_PATH|@cat:"js/autosize.cookie.js" require="jquery"}
+
+
+{combine_script id="conflit_script2" load="async" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js" require="jquery" }
+
+ 

extensions/Autosize/template/picture_2_2.tpl

@@ -1 @@
-{combine_script id="Affiche_script" path= $AUTOSIZE_PATH|@cat:"js/Affiche_script.js" require='jquery,autosize.cookie' }
+{combine_script id="Affiche_script" path= $AUTOSIZE_PATH|@cat:"js/Affiche_script.js" require='jquery,autosize.cookie,conflit_script' }