Changeset 19166
- Timestamp:
- Nov 25, 2012, 11:01:31 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Autosize/js/Affiche_script.js
r19156 r19166 491 491 //=================== 492 492 // options 493 //===================494 495 493 //========================================================= 496 /*messages = "This frame uses the W3C box model: <span>" + jQuery.support.boxModel + "</span>";497 messages += "This frame uses the html5Clone: <span>" + jQuery.support.html5Clone + "</span>";*/498 // jQuery("p").html(messages);499 494 if (typeof (options) == "undefined") { 500 495 options = { imageAutosize: false } … … 518 513 options.valide = jQuery(".Autosize").css("display") != "none"; 519 514 options.marge_haute = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("top")); 520 options.marge_basse = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("bottom")); 515 options.marge_basse = Math.max( 516 jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("bottom")), 517 options.marge_basse 518 ); 519 521 520 options.marge_gauche = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("left")); 522 521 options.marge_droite = jQuery(".Autosize").Get_Val_int(jQuery(".Autosize").css("right")); … … 901 900 if (options.imageAutosize == true) { 902 901 options.pictureSelType = options.pictureDeriv; 903 Zone_image.image_init.width = jQuery(theImg).width();904 Zone_image.image_init.height = jQuery(theImg).height();902 Zone_image.image_init.width = jQuery(theImg).width(); 903 Zone_image.image_init.height = jQuery(theImg).height(); 905 904 set_cl("no"); 906 905 Set_llbgo(true); … … 949 948 if (options.imageAutosize == false) 950 949 if (options.pictureSelType == "Autosize" || options.pictureSelType == "SelMaxi") { 951 jQuery(theMainImage_id).height(Zone_image.image.height );950 jQuery(theMainImage_id).height(Zone_image.image.height ); 952 951 jQuery(theMainImage_id).width(Zone_image.image.width); 952 953 jQuery(theMainImage_id).css("margin-top", options.marge_haute ); 953 954 954 955 } else { … … 1752 1753 if (!options.check_desc_v) 1753 1754 options.marge_bottom_2 = 0; 1754 else 1755 options.marge_bottom = 0; 1755 1756 1756 1757 1757 marge_bottom = options.marge_bottom_2 + options.marge_bottom; … … 1832 1832 options.theImageRight = (new_win.width - new_dim.right); 1833 1833 options.marge_bottom_2 = Math.ceil(new_dim.out.bottom - new_img.out.bottom); 1834 1834 1835 if (Type_Img == "iframe") { } 1835 1836 new_dim.out.bottom = new_win.height - options.marge_bottom_2; … … 1837 1838 options.theImageBottom = new_win.height - new_dim.out.bottom; 1838 1839 if (options.slideshow) { 1839 1840 1840 options.marge_top = 0; 1841 1841 } else { 1842 options.marge_top = Math.ceil(new_img.top - new_dim.top);1842 options.marge_top_2 = Math.ceil(new_img.top - new_dim.top) + options.marge_top; 1843 1843 } 1844 1844 … … 1846 1846 options.theImageBottom_2 = 0; 1847 1847 } 1848 1848 1849 options.theImageWidth = new_win.width - options.theImageLeft - options.theImageRight; 1849 1850 options.theImageHeight = new_win.height - options.marge_top - options.theImageBottom - options.theImageTop; … … 2273 2274 2274 2275 2275 }); // ready2276 }); // ready 2276 2277 2277 2278
Note: See TracChangeset
for help on using the changeset viewer.