Changeset 9948

Timestamp:

Mar 31, 2011, 12:16:12 PM (13 years ago)

Author:

cljosse

Message:

[extensions] autosize compatibility with piwigo 2.2.ORC4

Location:

extensions/Autosize

Files:

• admin/template/header_2_2.tpl (modified) (1 diff)
• autosize.inc.php (modified) (1 diff)
• js/Affiche_script.js (modified) (2 diffs)
• js/conflit.js (modified) (1 diff)
• template/header_2_2.tpl (modified) (1 diff)
• template/picture_2_2.tpl (modified) (1 diff)

extensions/Autosize/admin/template/header_2_2.tpl

@@ -1 @@
-{combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js "} 
+{get_combined_scripts load='header'} 
+{combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js"}
 {combine_script id="jquery.cluetip" path = $ROOT_URL|@cat:"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="dimensions" path = $AUTOSIZE_PATH|@cat:"js/jquery.dimensions.js" require="jquery"} 
-{combine_script id="jquery.ui" path=$ROOT_URL|@cat:"themes/default/js/ui/minified/jquery.ui.core.min.js" require="jquery"}
+{combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery"} 
+{combine_script id="dimensions" path = $AUTOSIZE_PATH|@cat:"js/jquery.dimensions.js" require="jquery"} 
+

extensions/Autosize/autosize.inc.php

@@ -33 +33 @@
   'AUTOSIZE_PATH_ABS',   $AUTOSIZE_PATH_ABS."/"
 );
-
 
 

extensions/Autosize/js/Affiche_script.js

@@ +1 @@
+
+if (typeof (randomPictOpt) == "undefined") {
+  var randomPictOpt = {
+    fixedHeight: 100,
+    delay: 10050,
+    showName: "n",
+    showComment: "n",
+    pictures: [
+          {
+            'comment': '',
+            'link': "",
+            'name': '',
+            'thumb': ""
+          }          
+                ]
+  };
+}
 
 
@@ -591 +608 @@
 
                  }
+                 MinWidth=jQuery(TheImg).css("minWidth");
+                 if (MinWidth == "0px")
+                 MinWidth =mini_width;
+                     MinHeight = jQuery(TheImg).css("minHeight");
+                 if (MinHeight == "0px")
+                     MinHeight = mini_height;
+
+                 MaxWidth = jQuery(TheImg).css("maxWidth");
+                 if (MaxWidth == "0px")
+                     MaxWidth = winwidth;
+                 MaxHeight = jQuery(TheImg).css("maxHeight");
+                 if (MaxHeight == "0px")
+                     MaxHeight = mwinheight;
 
                  //=============== Vérification taille minimale  autorizée ======================
-                 var miniWidth = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("min-width"), mini_width);
-                 var miniHeight = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("min-height"), mini_height);
-
-                 var miniWidth2 = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("min-width"), mini_width2);
-                 var miniHeight2 = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("min-height"), mini_height2);
-
-                 var maxWidth = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("max-width"), winwidth, "0");
-                 maxHeight = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("max-height"), winheight, "0");
+                 var miniWidth = jQuery(TheImg).Get_Val_int(MinWidth, mini_width);
+                 var miniHeight = jQuery(TheImg).Get_Val_int(MinHeight, mini_height);
+
+                 var miniWidth2 = jQuery(TheImg).Get_Val_int( MinWidth, mini_width2);
+                 var miniHeight2 = jQuery(TheImg).Get_Val_int( MinHeight, mini_height2);
+
+                 var maxWidth = jQuery(TheImg).Get_Val_int(MaxWidth, winwidth, "0");
+                 maxHeight = jQuery(TheImg).Get_Val_int(MaxHeight, winheight, "0");
 
 

extensions/Autosize/js/conflit.js

@@ -4 +4 @@
 //   $_SERVER['HTTP_USER_AGENT'] ;
 var OS, version;
+
 //============================================================================== 
 browser = detect_browser();

extensions/Autosize/template/header_2_2.tpl

@@ -1 @@
-{combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js "} 
+{get_combined_scripts load='header'}
+{combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js "} 
 {combine_script id="jquery.cluetip" path = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.js" require="jquery" } 
 {combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.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' }
+{combine_script id="Affiche_script" path= $AUTOSIZE_PATH|@cat:"js/Affiche_script.js" require='jquery,cookie' }