Changeset 16935

Timestamp:

Jul 23, 2012, 3:34:30 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, new options

Location:

extensions/Autosize

Files:

• js/Affiche_script.js (modified) (2 diffs)
• template/picture.tpl (modified) (2 diffs)

extensions/Autosize/js/Affiche_script.js

@@ -1099 +1099 @@
     if (n > pt.length - 1) n = pt.length - 1; // format le plus grand
     if (n < 0) n = 0; // format le plus grand
+    if (typeof pt[n] == "undefined") {
+
+      n = n - 1
+    }
+
     imgSrc = pt[n][1];
     last_map = pt[n][5];
@@ -2354 +2359 @@
 
 
-});                                                                                                                                                     // ready
+});                                                                                                                                                      // ready
 
   //=====================================================================

extensions/Autosize/template/picture.tpl

@@ -21 +21 @@
 
  <script language="JavaScript" type="text/javascript">
- {if $ASP.width}
+   var src1="{$cl_autosize_button.ICON}";
+   var src2="{$cl_autosize_button.ICON2}";
+   var src3="{'cl_autosize_info_2'|@translate}";
+   var src4 = "{'cl_autosize_info'|@translate}";
+   var src5 = "{'cl_autosize_info_1'|@translate}";
+   var src6 = "{$cl_autosize_button.ICON1}";
+
+   {if $ASP.width}
    jQuery(window).load(function () {ldelim}
- var asp_options ={ldelim} };
+   var asp_options ={ldelim} };
    if(typeof $("#imageToolBar") !="undefined" )
-    var w = $("#imageToolBar").width();
-        if (w === null) {ldelim} w = $("#theImage").width(); }
-        if (w < {$ASP.min_viewport_width}) {ldelim} w = .75 * $("#theImage").width(); }
+   var w = $("#imageToolBar").width();
+   if (w === null) {ldelim} w = $("#theImage").width(); }
+   if (w < {$ASP.min_viewport_width}) {ldelim} w = .75 * $("#theImage").width(); }
         var m = w;
         w = w * ( Math.min( Math.max({$ASP.viewport_width} / 100, .5) , 1 ));
@@ -49 +56 @@
  });
   {/if}
-
- var src1="{$cl_autosize_button.ICON}";
- var src2="{$cl_autosize_button.ICON2}";
- var src3="{'cl_autosize_info_2'|@translate}";
- var src4 = "{'cl_autosize_info'|@translate}";
- var src5 = "{'cl_autosize_info_1'|@translate}";
- var src6 = "{$cl_autosize_button.ICON1}";
  </script>