Changeset 8588 for extensions/Autosize

Timestamp:

Jan 10, 2011, 4:58:04 PM (14 years ago)

Author:

cljosse

Message:

[autosize] compatiblity with gally 1.4.0

Location:

extensions/Autosize/js

Files:

• Affiche_script.js (modified) (4 diffs)
• conflit.js (modified) (2 diffs)
• jquery.dimensions.js (modified) (1 diff)

extensions/Autosize/js/Affiche_script.js

@@ -247 +247 @@
 
                  var Cadre = jQuery(Parent).get(0);
-                 var info_Cadre = jQuery(Cadre).infos();
+                 var info_theImage = jQuery(Cadre).infos();
                  //===============  Information cadre ======
                  var info_the_page = jQuery("#the_page").infos();
@@ -331 +331 @@
                          img_reelle.height = info_img.height;
                          info_map = jQuery("#mapPicture").infos();
-                         marge_left = info_map.width;
-                         jQuery("#map").css("left", marge_left + "px");
-
+                         jQuery("#map").css("left", info_map.width + "px");
                          Bandeau_bas.height = 10;
-                         marge_right = 10;
-                         img_reelle.width = winwidth - marge_left - marge_right;
+                        
+                         if (theme.match(RegExp("simple", "g"))) {
+                             img_reelle.width = winwidth; //- info_map.width -marge_right;
+                         } else { 
+                          img_reelle.width = winwidth - info_map.width -marge_right;
+                         }
+
+
                          info_the_page = jQuery("#the_page").infos();
+                         winwidth = img_reelle.width;
+
                          ;
 
@@ -820 +826 @@
                  jQuery("#navThumbPrev").css({ overflow: "hidden" });
                  jQuery("#navThumbNext").css({ overflow: "hidden" });
+                 n = typeof inittoolbar;
+
                  try {
                      if (theme.match(RegExp("gally", "gi"))) {
-
+                         if (typeof inittoolbar == "function") {
+                             if (typeof (currentTab) == "undefined") inittoolbar();
+                             else initializeImageMode("resize");
+                         }
                          //===========================================================================
-                         initializeImageMode("resize");
+
                          if (jQuery("#navThumbPrev").length > 0) {
                              jQuery("#navThumbPrev").css({ height: info_img.height + "px",
@@ -840 +851 @@
                          if (Type_Img == "map")
                              jQuery("#navThumbNextContainer").css({ background: 'none' });
-
-
-
-                         if (!theme.match(RegExp("lapis", "gi"))) { initializeImageMode("resize"); }
+                         if (!theme.match(RegExp("lapis", "gi"))) {
+                             initializeImageMode("resize");
+                         }
+
                      } else if (theme.match(RegExp("simple", "g"))) {
 
                          jQuery("#imageToolBar").css({ position: "static" });
-                         
+
                          info_imageInfoBar = jQuery("#imageInfoBar").infos();
                          if (info_imageInfoBar.bottom < info_img.bottom) {
-                          //   jQuery("#imageInfoBar").height(info_img.bottom);
+                             //   jQuery("#imageInfoBar").height(info_img.bottom);
                          }
 

extensions/Autosize/js/conflit.js

@@ -78 +78 @@
     //====================================================
     if (typeof (element) == "string") {
-        if (element.match("^#|.ui", "gi")) {
+        if (element.match("^#|.ui|html", "gi")) {
             ret_element = jQuery(element);
             return ret_element;
@@ -169 +169 @@
 jQuery(document).ready(
        function (jQuery) {
-            jQuery(window).load(function () {
-             //============================================================
-             jQuery("#icon_gmaps").bind('click', function () {
-
-                jQuery('html,body').stop().scrollTop(0);
-                jQuery('html,body').stop().scrollLeft(0);
-                jQuery(".ui-widget-overlay").css("opacity", "0.75");
-
-                l1 = (jQuery(window).width() - (jQuery(".gmapsPopup").width())) / 2;
-                h1 = (jQuery(window).height() - (jQuery(".gmapsPopup").height())) / 2;
-
-                jQuery(".gmapsPopup").css("left", l1 + "px");
-                jQuery(".gmapsPopup").css("top", h1 + "px");
-            })
-            //=============================================================  
-            if (typeof(Parent)=="undefined")
-                Parent = "#theImage";
-                info_image = jQuery(Parent).infos();
-                p0 = jQuery(Parent);
-                if (p0.length > 0) {   
-                    //======================================================
-                    if (theme.match("gally", "gi"))
-                    if (jQuery.isFunction(inittoolbar)) {
-                        if (typeof (currentTab) == "undefined") inittoolbar();
-                            else initializeImageMode("resize");
-                        if (info_image.position != "static") {
-                            //==== compatibilité Gally/LLGBO ===
-                            //--- passage relative ==> static ===/
-                            jQuery(Parent).css({ position: "static" } );
-                            jQuery("#imageToolBar").css({ position: "relative", top: "0px" });
-                        };
-                     }
-                }
-            //   jQuery(window).resize();
-        });
-    //=============================================================        
-    //  $ = _$2; ;
-});
+           jQuery(window).load(function () {
+               //============================================================
+               jQuery("#icon_gmaps").bind('click', function () {
+
+                   jQuery('html,body').stop().scrollTop(0);
+                   jQuery('html,body').stop().scrollLeft(0);
+                   jQuery(".ui-widget-overlay").css("opacity", "0.75");
+
+                   l1 = (jQuery(window).width() - (jQuery(".gmapsPopup").width())) / 2;
+                   h1 = (jQuery(window).height() - (jQuery(".gmapsPopup").height())) / 2;
+
+                   jQuery(".gmapsPopup").css("left", l1 + "px");
+                   jQuery(".gmapsPopup").css("top", h1 + "px");
+               })
+               //=============================================================  
+               if (typeof (Parent) == "undefined")
+                   Parent = "#theImage";
+               info_image = jQuery(Parent).infos();
+               p0 = jQuery(Parent);
+               if (p0.length > 0) {
+                   //======================================================
+                   if (info_image.position != "static") {
+                       try {
+                           if (theme.match("gally", "gi")) {
+                               if (typeof gallyPP != "undefined") {
+                                  
+                               } else if (jQuery.isFunction(inittoolbar)) {
+                                   if (typeof (currentTab) == "undefined") inittoolbar();
+                                   else initializeImageMode("resize");
+                               };
+                               //==== compatibilité Gally/LLGBO ===
+                               //--- passage relative ==> static ===/
+                               jQuery(Parent).css({ position: "static" });
+                               jQuery("#imageToolBar").css({ position: "relative", top: "0px" });
+
+                           }
+                       } catch (e) {
+                       }
+
+                   }
+               }
+               //   jQuery(window).resize();
+           });
+           //=============================================================        
+           //  $ = _$2; ;
+       });
 
 

extensions/Autosize/js/jquery.dimensions.js

@@ -135 +135 @@
                     margin.top = jQuery(elem).Get_Val_int(Css.marginTop);
                     margin.bottom = jQuery(elem).Get_Val_int(Css.marginBottom);
-
                     try {
                         margin.margin = Css.margin;
-
                     } catch (e) {
                         margin.margin = '"' + margin.left + ' ' + margin.top + ' ' + margin.right + ' ' + margin.bottom + '"';