Changeset 7873 for extensions/Autosize

Timestamp:

Nov 25, 2010, 4:37:43 PM (13 years ago)

Author:

cljosse

Message:

[Autosize][beta] fix compatiblity with theme stripped.

Location:

extensions/Autosize

Files:

• js/Affiche_script.js (modified) (9 diffs)
• js/conflit.js (modified) (6 diffs)
• main.inc.php (modified) (1 diff)

extensions/Autosize/js/Affiche_script.js

@@ -3 +3 @@
 } else {
     // jQuery est chargé
+}
+try {
+    Autosize = { version: Version };
+} catch (e) {
+
 }
 function Toggle_bp() {
@@ -150 +155 @@
              if (Zone_Affichage.width == 0)
                  Parent = Parent + "Box";
+
+             Parent = "#theImage";
              Zone_Affichage = jQuery(Parent).infos();
              //   
@@ -188 +195 @@
          */
          //=========================================================
-
+         old_window  ={width:0,height:0};
 
          jQuery.fn.extend({
@@ -235 +242 @@
                  var winwidth = jQuery(window).width();
                  var winheight = jQuery(window).height();
-
+                 n = winwidth - old_window.width;
+                 if (n == 0) {
+                     n = winheight - old_window.height;
+                     if (n == 0) return true;
+                 }
                  old_window = jQuery(window).infos();
                  //===========================================================================
@@ -269 +280 @@
                  var info_ToolBar = jQuery("#imageToolBar").infos();
                  var marge = 0;
-                 if (info_ToolBar.width > 0)
-                     marge = (Zone_Affichage.width - info_ToolBar.width) / 2;
-
-                 var marge_right = marge;
-                 var marge_left = marge;
-
-                 if (info_content.width > 100) {
-                     marge_left = 0;
-                     marge_right = (info_imageInfoBar.margin.left + info_imageInfoBar.margin.right);
-                     winwidth = info_content.width;
-                     marge_right = info_imageInfoBar.width + marge_right;
-
+                 marge_right = 0;
+                 marge_left = 0;
+                 if (theme.match(RegExp("simple", "g"))) {
+                     if (info_ToolBar.width > 0)
+                         marge = (Zone_Affichage.width - info_ToolBar.width) / 2;
+
+                     var marge_right = marge;
+                     var marge_left = marge;
+
+                     if (info_content.width > 100) {
+
+                         marge_left = 0;
+                         marge_right = (info_imageInfoBar.margin.left + info_imageInfoBar.margin.right);
+                         winwidth = info_content.width;
+                         marge_right = info_imageInfoBar.width + marge_right;
+
+                     }
                  }
                  else
@@ -286 +302 @@
 
 
-                 marge_right -= Zone_Affichage.borderwidth.right;
+
+                 marge_right += Zone_Affichage.borderwidth.right;
                  marge_left += Zone_Affichage.borderwidth.left;
                  winwidth -= (marge_right + marge_left);
@@ -542 +559 @@
                          widthmin = parseInt(width_user);
                      var marges = marges_llgbo;
-                     if (typeof(info_img)!="undefined")
-                     {
-                     widthmin -= info_img.borderwidth.left||0;
-                     widthmin -= info_img.borderwidth.right || 0;
+                     if (typeof (info_img) != "undefined") {
+                         widthmin -= info_img.borderwidth.left || 0;
+                         widthmin -= info_img.borderwidth.right || 0;
                      }
                      widthmin -= marges;
@@ -867 +883 @@
                  if (pos != jQuery("#copyright").infos())
                      pos = jQuery("#copyright").infos();
-                 if (pos.top > 100) jQuery("#the_page").height(pos.top);
+                 if (!theme.match(RegExp("stripped", "gi"))) {
+                     if (pos.top > 100)
+
+                         jQuery("#the_page").height(pos.top);
+                 }
+
                  if (!theme.match(RegExp("luciano", "gi"))) {
                      jQuery("#linkNext").css({ height: "80px", width: "200px", overflow: "hidden" });
@@ -924 +945 @@
                      return myImg;
                  }
-//====================================================
 
                  //============================================================

extensions/Autosize/js/conflit.js

@@ -1 +1 @@
 //==== autosize  remplace $(... avec jQuery( ====
 /*
-* A faire Compatibilité entre LLGBO GMAPS
-*           Infobulles spécifiques pour les EXIFS au survol du bouton :  Non  pour être ok
-*147 llgbo2 main.php.   //      $template->Clear_assign('metadata');// hide original metadata
 *[gmaps=id:1;width:800;height:640;]
 *       Luciano rv_gmaps
@@ -23 +20 @@
 var detect = navigator.userAgent.toLowerCase();
 var OS, version;
-
 //============================================================================== 
-
-
 browser = detect_browser();
-
-
-
 
 function detect_browser() {
@@ -163 +154 @@
     if (DEBUG == "true") {
         retour = (getStackTrace());
-        alert("element : " + element + " retour : " + retour);
+        alert("element : " + element + " retour : " + retour + "Fonctions:" + Fn);
 
     }
@@ -189 +180 @@
                 jQuery(".gmapsPopup").css("top", h1 + "px");
             })
-            //=============================================================                
-            p0 = jQuery("#theImage");
-            if (p0.length) {
-
+            //=============================================================  
+            if (typeof(Parent)=="undefined")
+                Parent = "#theImage";
+
+            info_image = jQuery(Parent).infos();
+            if (info_image.height==0) {
+                Parent = "#theImageBox";
+            }
+
+
+            p0 = jQuery(Parent);
+
+            if (p0.length > 0) {
+             
+  
                 //======================================================
                 if (theme.match("gally", "gi"))
@@ -200 +202 @@
                     };
 
-                p1 = jQuery("#theImage").css("position");
-                if (p1 != "static") {
+                    if (info_image.position != "static") {
                     //==== compatibilité Gally/LLGBO ===
                     //--- passage relative ==> static ===/
-                    jQuery("#theImage").css({ position: "static"
-                    }
-
-                    );
+                    jQuery(Parent).css({ position: "static" } );
                     jQuery("#imageToolBar").css({ position: "relative", top: "0px" });
                 }
@@ -547 +545 @@
 $_ = $;
 function save_framework(page) {
+    Conflit = { version: Version };
     $_ = $;
-    Conflit = { version: Version };
     return
 

extensions/Autosize/main.inc.php

@@ -17 +17 @@
         $path = AUTOSIZE_PATH; 
           $plg_data = implode( '', file($path.'main.inc.php') );
+                   
           if ( preg_match("|Plugin Name: (.*)|", $plg_data, $val) )
           {