Changeset 7220

Timestamp:

Oct 16, 2010, 12:57:44 PM (14 years ago)

Author:

cljosse

Message:

[Autosize][beta]fix bugs.

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (1 diff)
• js/Affiche_script.js (modified) (7 diffs)
• main.inc.php (modified) (2 diffs)

extensions/Autosize/autosize.inc.php

@@ -33 +33 @@
                 global $infos_message,$erreur_message;
                 global  $conf,$lang ,$user,$userdata;
-                $image['width']="1200";
-                                  $asp['image_name'] = $image['name'];
-                  $asp['width'] = $image['width'];
-                  $asp['height'] = $image['height'];
-                
 
                 load_language('lang', AUTOSIZE_PATH);

extensions/Autosize/js/Affiche_script.js

@@ -131 +131 @@
             };
         //===================================================================   
- 
+
         var old_h = 0;
         var rapport = -1;
@@ -310 +310 @@
             switch (Type_Img) {
                 case "map":
-                    var info_image = jQuery("#mapPicture").info();
-                    marge_left = info_image.width;
-
-                    if (theme.match(RegExp("gally", "g"))) {
-                        jQuery("#map").css("top", "30px");
-                    }
-                    jQuery("#map").css("left", info_image.width + "px");
+                    var info_image = jQuery("#map").info();
+
+                    var info_map = jQuery("#mapPicture").info();
+
+                    marge_left = info_map.width;
+                    jQuery("#map").css("left", marge_left);
+
                     var TheImg = jQuery("#map").get(0);
                     info_image = jQuery("#map").info();
@@ -572 +572 @@
 
                 if (theme.match(RegExp("gally", "g"))) {
-                    Image_height -= "30";
+                    //  Image_height -= "30";
                 }
 
@@ -729 +729 @@
                 jQuery("object").height(Image_height);
             } else if (Type_Img == "panorama") {
-
-
+            
                 //      jQuery(TheImg).panorama2(img_finale.height, img_finale.width);
                 jQuery(TheImg).height(img_finale.height);
@@ -767 +766 @@
                 h_frame = jQuery("#pamoorama").width();
                 if (old_w == jQuery(window).width() && old_h == jQuery(window).height()) {
-                     
-                     if (info_pamoorama_outter.width == 0)
-                         setTimeout("wait_Timer()", 100);
+
+                    if (info_pamoorama_outter.width == 0)
+                        setTimeout("wait_Timer()", 100);
                     //     jQuery(TheImg).css("zoom", zoom);
                 }
@@ -782 +781 @@
 
             } else {
-
+                //===map ? ===
                 jQuery(TheImg).height(img_finale.height);
                 jQuery(TheImg).width(img_finale.width);
@@ -819 +818 @@
 
     } // function
-);                                                                                                                                                                                                        // ready
+);                                                                                                                                                                                                           // ready
 
 /* Extension

extensions/Autosize/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: AutoSize
-Version: 1.2.0
+Version: 1.1.0
 Description: Ajuste l'affichage des photos en fonction de la hauteur de la fenetre de navigation
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=448
@@ -12 +12 @@
 if (!defined('AUTOSIZE_PATH')) 
 define(  'AUTOSIZE_PATH',   PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/' );
-
 include_once(AUTOSIZE_PATH.'autosize.inc.php');
-
 $autosize_controler = new autosize_controler();
 add_event_handler('loc_after_page_header', array(&$autosize_controler, 'cl_autosize_affiche'), 95 );
 add_event_handler('get_admin_plugin_menu_links', array(&$autosize_controler,'cl_autosize_admin')  );
-
-
- add_event_handler('load_profile_in_template', array(&$autosize_controler,'cl_autosize_script'),50 );
-
-
-
+add_event_handler('load_profile_in_template', array(&$autosize_controler,'cl_autosize_script'),50 );
+ 
 ?>