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

Timestamp:

Sep 16, 2012, 11:31:20 PM (12 years ago)

Author:

Zaphod

Message:

version 2.3.0

File:

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

extensions/stripped/js/scripts-tpp.js

@@ -160 +160 @@
         var img_ratio=image_w / image_h;
 
-        if (options.imageAutosize) {
-        
-                // Autosize image
+        if ((options.imageAutosize) || (options.themeStyle != 'original')) {
+        
                 jQuery(window).resize(function () {
                         
@@ -172 +171 @@
                         var Content=jQuery("#content");
                         
-                        var marge_cote;
-
+                        var marge_cote=5;
+                        
                         var marge_sup = 5 + Content.offset().top;
                         var marge_inf;
-                        if (options.themeStyle == 'original') { marge_inf = options.imageAutosizeMargin+10;} else { marge_inf = 30;};
+                        if (options.themeStyle == 'original') {
+                                marge_inf = options.imageAutosizeMargin+10;     
+                                if (options.navArrows) marge_cote=20;
+                        } else {
+                                marge_inf = 30;
+                                if (options.navArrows) marge_cote=25;
+                        }
                         var marge_spec = 0;
 
@@ -197 +202 @@
                         }
                         
-                        var Hmin = options.imageAutosizeMinHeight;
-                        
                         if (Image.length != 1) {
                                 if (TitleBox.length !=0) TitleBox.css("width","97%");
@@ -204 +207 @@
                         }
 
+                        var win_height = Fenetre.height();
                         marge_inf = ImageContainer.height()-Image.height()+marge_inf;
-                        var win_height = Fenetre.height();
                         var img_H = win_height - marge_sup - marge_inf;
-                        var max_H = img_H;
-
-                        
-                        if (img_H >= image_h) img_H = image_h;
-                        if (img_H <= Hmin) img_H = Hmin;
-
-                        var img_W = Math.round(parseFloat(img_H * img_ratio));
-                        
-
-                        var marge_image = ImageCadre.outerWidth() - Image.width();
-                        var ext_width;
-                        
-                        if (options.themeStyle == 'original') { ext_width = jQuery("#content").width();} else {ext_width = Fenetre.width();};
-                        var max_W = ext_width - marge_image - marge_cote * 2;
-                        
-                        if (img_W > max_W) {
-                                img_H = Math.round(parseFloat(max_W / img_ratio));
-                                img_W = max_W;
-                        }
-                        
-                        Image.css("width", img_W + "px");
-                        Image.css("height", img_H + "px");
+
+                        if (options.imageAutosize) {
+                        
+                                var Hmin = options.imageAutosizeMinHeight;
+                                
+                                var max_H = img_H;
+
+                                if (img_H >= image_h) img_H = image_h;
+                                if (img_H <= Hmin) img_H = Hmin;
+
+                                var img_W = Math.round(parseFloat(img_H * img_ratio));
+                                
+                                var marge_image = ImageCadre.outerWidth() - Image.width();
+                                var ext_width;
+                                
+                                if (options.themeStyle == 'original') { ext_width = jQuery("#content").width();} else {ext_width = Fenetre.width();};
+                                var max_W = ext_width - marge_image - marge_cote * 2;
+                                
+                                if (img_W > max_W) {
+                                        img_H = Math.round(parseFloat(max_W / img_ratio));
+                                        img_W = max_W;
+                                }
+                        
+                                Image.css("width", img_W + "px");
+                                Image.css("height", img_H + "px");
+                        
+                        } else {
+                        
+                                img_H = image_h;
+
+                        }
 
                         if (options.themeStyle != 'original') {
@@ -252 +264 @@
                         TitleBox.css("opacity","1");
 
-
-                        // limit img title Container width
-/*
-                        if (TitleBox.length != 0) {
-                                var TBminW = jQuery("#theImg").outerWidth();
-                                TitleBox.css("min-width",TBminW + "px");
-                                if (TitleBox.width() > TBminW) {
-                                        TitleBox.children().css("text-align","justify");
-                                } else {
-                                        TitleBox.children().css("text-align","center");
-                                }
-                        }
-*/
-                        // test
                         if (options.themeStyle != 'original') {
                                 var max_footer_width = jQuery("#content").width() - jQuery("#tabTitles").width() - 5;
@@ -281 +279 @@
                 jQuery("#theImg").css("opacity","1");
                 jQuery("#imageTitleContainer").css("opacity","1");
+                jQuery("#theImageAndTitle").css("position","static");
+                jQuery("#theImageAndTitle").css("margin-top","10px");
                 var TitleBox=jQuery("#imageTitleContainer");
                 if (TitleBox.length !=0) TitleBox.css("width","97%");
-                
         }