Changeset 17407 for extensions/stripped/js/scripts-tpp.js

Timestamp:

Aug 5, 2012, 4:51:13 PM (12 years ago)

Author:

Zaphod

Message:

version 2.2.7

File:

• extensions/stripped/js/scripts-tpp.js (modified) (4 diffs)

extensions/stripped/js/scripts-tpp.js

@@ -174 +174 @@
                         var marge_cote;
 
-                        if (ImageCadre.length == 0) {
-                                ImageContainer.css("opacity","1");
-                                jQuery("img","#theImageAndTitle").css("opacity","1");
-                                return;
-                        }
-                        
-                        if (options.navArrows) {marge_cote=30;} else {marge_cote=10;};
-
                         var marge_sup = 5 + Content.offset().top;
                         var marge_inf;
                         if (options.themeStyle == 'original') { marge_inf = options.imageAutosizeMargin+10;} else { marge_inf = 30;};
                         var marge_spec = 0;
+
+                        if (ImageCadre.length == 0) {
+                                ImageContainer.css("opacity","1");
+                                jQuery("img","#theImageAndTitle").css("opacity","1");
+                                ImageContainer.css("top",marge_sup+"px");
+                                //maps & earth
+                                if (jQuery("#map").length == 1) {
+                                        ImageContainer.css("position","static");
+                                        ImageContainer.css("margin-top","10px");
+                                }
+                                return;
+                        }
                         
                         var slideshow=jQuery("#light_slideshow");
@@ -361 +365 @@
 {
   p = new Object();
+  imgH = jQuery(document).data("highHeight") 
+  imgW = jQuery(document).data("highWidth") 
 
   if(zoom=='full')
@@ -369 +375 @@
     p.top=options.marginContainer;
 
-    if(p.width>jQuery(document).data("highWidth"))
-    {
-      p.width = jQuery(document).data("highWidth")-options.paddingContainer*2;
+    if(p.width>imgW)
+    {
+      p.width = imgW;
       p.left = (jQuery("html").get(0).clientWidth-p.width)/2;
-    }
-
-    if(p.height>jQuery(document).data("highHeight"))
-    {
-      p.height = jQuery(document).data("highHeight")-options.paddingContainer*2;
+      jQuery("#theImgHighZoomButton").hide();
+    }
+
+    if(p.height>imgH)
+    {
+      p.height = imgH;
       p.top = (jQuery("html").get(0).clientHeight-p.height)/2;
-    }
+      jQuery("#theImgHighZoomButton").hide();
+    }
+        
+        if ((p.width==imgW) && (p.height==imgH)) switchZoomHigh();
   }
   else
   {
     //zoom = 'fit'
-    ratioImg = jQuery(document).data("highWidth") / jQuery(document).data("highHeight");
+        ratioImg = imgW / imgH;
     ratioPage = jQuery("html").get(0).clientWidth / jQuery("html").get(0).clientHeight;
 
@@ -398 +408 @@
       p.height = p.width/ratioImg;
     }
+        
+        if ((p.width > imgW) || (p.height > imgH)) {
+                p.height = imgH;
+                p.width = imgW;
+                jQuery("#theImgHighZoomButton").hide();
+        }
     p.left = (jQuery("html").get(0).clientWidth-p.width)/2;
     p.top = (jQuery("html").get(0).clientHeight-p.height)/2;