Changeset 7574 for extensions/Autosize/js

Timestamp:

Nov 2, 2010, 1:56:10 PM (13 years ago)

Author:

cljosse

Message:

[Autosize][beta] adjust width with pamooramic.

Location:

extensions/Autosize/js

Files:

• Affiche_script.js (modified) (5 diffs)
• conflit.js (modified) (3 diffs)

extensions/Autosize/js/Affiche_script.js

@@ -355 +355 @@
               var winheight = jQuery(window).height();
               if (old_w == winwidth && old_h == winheight) return;
+
 
 
@@ -437 +438 @@
                   var info_pamoorama_footer = jQuery("#pamoorama_footer").info();
                   TheImg = jQuery("#pamoorama");
-
+                  if (typeof (myPamoorama) == "undefined") {
+                      return
+
+                  }
+
+
+                  po = myPamoorama;
+
+                  /*
+                  myPamoorama = new pamoorama('pamoorama',{ activateSlider:     {$PANO_ACTIVATESLIDER},
+                  width:                {$PANO_WIDTH},
+                  footercolor:          '{$PANO_FOOTERCOLOR}',
+                  captioncolor:         '{$PANO_CAPTIONCOLOR}',
+                  caption:              '{$ALT_IMG}',
+                  enableAutoscroll:     {$PANO_ENABLEAUTOSCROLL},
+                  autoscrollSpeed:      {$PANO_AUTOSCROLLSPEED},
+                  autoscrollOnLoad:     {$PANO_AUTOSCROLLONLOAD},
+                  startAutoscroll:      '{'pamooramics_startAutoscroll'|@translate}',
+                  stopAutoscroll:               '{'pamooramics_stopAutoscroll'|@translate}',
+                  loadingMessage: '{'pamooramics_loading'|@translate}',
+                  clickMessage:         '{'pamooramics_clickMessage'|@translate}',
+                  dragMessage:          '{'pamooramics_dragMessage'|@translate}'
+                  });
+                  */
                   /*
                   pamoorama_outter
@@ -547 +571 @@
                   case "pamoorama":
                       //=========================================================
-                      var Images = jQuery("#pamoorama img");
-                      var Image = jQuery("#pamoorama").find("img");
-
+
+
+                      if (typeof (myPamoorama.imageHeight) == "undefined") return;
+
+                      img_reelle.height = myPamoorama.imageHeight;
+                      img_reelle.width = myPamoorama.imageWidth;
+                      TheImg = myPamoorama.image;
                       info_theImage = jQuery("#pamoorama").info();
                       info_the_page = jQuery("#the_page").info();
+
                       break
 
@@ -875 +904 @@
 
               } else if (Type_Img == "pamoorama") {
-                  return;
+
+                  img_height = myPamoorama.imageHeight
 
                   marge_left += 0;
                   new_width = Zone_Affichage.width - marge_right - marge_left;
-                  jQuery("#pamoorama").css({ margin: 0 + "px",
-                      left: marge_left + "px",
+                  new_width -= 4;
+                  jQuery("#pamoorama").css({ marginLeft: "auto",
+                      marginRight: "auto",
+
                       height: Image_height + info_pamoorama_footer.height + "px",
                       width: new_width + "px"
                   });
 
+                  myPamoorama.options.width = new_width;
                   jQuery("#pamoorama").width(new_width);
+
+
 
 
                   jQuery("#pamoorama_outter").css({
                       left: marge_left + "px",
-                      height: Image_height + "px",
+                      height: myPamoorama.imageHeight + "px",
                       width: (new_width) + "px"
                   });
                   jQuery("#pamoorama_outter").width(new_width);
-
-
-                  jQuery("#pamoorama_footer").width((Zone_Affichage.width - marge_right - marge_left));
-                  jQuery("#pamoorama_footer").css('width', (Zone_Affichage.width - marge_right - marge_left) + "px");
+                  h = info_theImage.height;
+                  jQuery("#pamoorama").css({ height: h + "px" });
+
+                  jQuery("#pamoorama_footer").width(new_width);
+                  jQuery("#pamoorama_footer").css('width', new_width + "px");
+
+                  jQuery("#linkNext").css({ width: "200px", overflow: "hidden" });
+                  jQuery("#linkPrev").css({ width: "200px", overflow: "hidden" });
                   zoom = Image_height / img_height;
-                  info_pamoorama_outter = jQuery("#pamoorama_outter").info();
-
-                  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);
-                      */
-                      //     jQuery(TheImg).css("zoom", zoom);
-                  }
+                  var init_old_w;
+                  if (init_old_w == 0) {
+                      init_old_w = old_w;
+                      old_w = 0;
+                  }
+
 
 
@@ -1022 +1057 @@
 
       } // function
-);                                                                                                                                                                                                                                                                                                                                                                                                                                       // ready
+);                                                                                                                                                                                                                                                                                                                                                                                                                                                       // ready
     /*
 *

extensions/Autosize/js/conflit.js

@@ -1 +1 @@
 //==== autosize  remplace $(... avec jQuery( ====
 var d1 = 0;
-var init_tb = 0;             
-
+var init_tb = 0;
+function ne(a) {
+    return new V(a[ib], a[hc]) 
+}
 
  function $(element, nc) {
@@ -17 +19 @@
           if (tpj.length > 0) {             }
           jQuery(window).load(function () {
+
+
               if (jQuery("#theImage").css("position") == "relative") {
                   //==== compatibilité Gally/LLGBO ===
@@ -374 +378 @@
 
 //=========================================================
-(function ($) {
-              $.fn.panorama2 =
+(function ($2) {
+              $2.fn.panorama2 =
               function (height, width) {