FIXED: img element is broken HTML when the caption contains both apostrophe (') and greater-than sign (>) (ThickBox bug)

This commit is contained in:
attosoft committed 2012-10-18 04:14:31 +00:00
1 parent 995f44d9f0
commit 5dca6d14f5
2 files changed
+2 -1

No files matched your search

+1
View File
@@ -282,6 +282,7 @@ Modified ThickBox supports multiline (line breaks) in title/caption. The followi
== Changelog ==
= Latest Version =
* FIXED: `img` element is broken HTML when the caption contains both apostrophe (`'`) and greater-than sign (`>`) (ThickBox bug)
* FIXED: Modified Settings screen with CSS width properties and CSS3 Media Queries for small-width screen
= 1.9 =
+1 -1
View File
@@ -13,7 +13,7 @@ height:(document.body.scrollHeight>document.body.offsetHeight?document.body.scro
/\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$|\.webp$|\.pdf$/,f=d.toLowerCase().match(e);if(".jpg"==f||".jpeg"==f||".png"==f||".gif"==f||".bmp"==f||".webp"==f){TB_imageCount=TB_NextHTML=TB_NextURL=TB_NextCaption=TB_PrevHTML=TB_PrevURL=TB_PrevCaption="";TB_FoundURL=!1;TB_LastURL=TB_LastCaption=TB_FirstURL=TB_FirstCaption="";if(b){TB_TempArray=jQuery("a[rel="+b+"]").get();for(TB_Counter=0;TB_Counter<TB_TempArray.length&&""===TB_NextHTML;TB_Counter++)TB_TempArray[TB_Counter].href.toLowerCase().match(e),("object"==
typeof a?TB_TempArray[TB_Counter]!=a:TB_TempArray[TB_Counter].href!=c)?TB_FoundURL?(TB_NextCaption=TB_TempArray[TB_Counter],TB_NextURL=TB_TempArray[TB_Counter].href,TB_NextHTML="<span id='TB_next'>&nbsp;&nbsp;<a href='#'>"+thickboxL10n.next+"</a></span>"):(TB_PrevCaption=TB_TempArray[TB_Counter],TB_PrevURL=TB_TempArray[TB_Counter].href,TB_PrevHTML="<span id='TB_prev'>&nbsp;&nbsp;<a href='#'>"+thickboxL10n.prev+"</a></span>"):(TB_FoundURL=!0,TB_imageCount=thickboxL10n.image+" "+(TB_Counter+1)+" "+
thickboxL10n.of+" "+TB_TempArray.length);TB_FirstCaption=TB_TempArray[0];TB_FirstURL=TB_TempArray[0].href;TB_LastCaption=TB_TempArray[TB_TempArray.length-1];TB_LastURL=TB_TempArray[TB_TempArray.length-1].href}imgPreloader=new Image;imgPreloader.onload=function(){function d(a,b,c){var e=a-jQuery("#TB_Image").width(),f=b-jQuery("#TB_Image").height();jQuery("#TB_window").css({marginLeft:Math.round(parseInt(jQuery("#TB_window").css("marginLeft"))-e/2),marginTop:Math.round(parseInt(jQuery("#TB_window").css("marginTop"))-
f/2)});jQuery("#TB_window").width(jQuery("#TB_window").width()+e).height("auto");jQuery("#TB_Image").width(a).height(b);c&&jQuery("#TB_window a.scalable").attr("title",c)}imgPreloader.onload=null;var e=c.replace(/^[^\?]+\??/,""),f=tb_parseQuery(e);"object"==typeof a&&(a=tb_caption(a));TB_Image="<img id='TB_Image' src='"+c+"' width='"+imgPreloader.width+"' height='"+imgPreloader.height+"' alt='"+a+"'/>";"close"==tb_options.click_img||!b&&"close"==tb_options.click_end?TB_Image="<a href='' id='TB_ImageOff' title='"+
f/2)});jQuery("#TB_window").width(jQuery("#TB_window").width()+e).height("auto");jQuery("#TB_Image").width(a).height(b);c&&jQuery("#TB_window a.scalable").attr("title",c)}imgPreloader.onload=null;var e=c.replace(/^[^\?]+\??/,""),f=tb_parseQuery(e);"object"==typeof a&&(a=tb_caption(a));TB_Image="<img id='TB_Image' src='"+c+"' width='"+imgPreloader.width+"' height='"+imgPreloader.height+"' alt='"+a.replace("'","&apos;")+"'/>";"close"==tb_options.click_img||!b&&"close"==tb_options.click_end?TB_Image="<a href='' id='TB_ImageOff' title='"+
thickboxL10n.close+"'>"+TB_Image+"</a>":"open"==tb_options.click_img?TB_Image="<a href='"+c+"' target='_blank' title='"+thickboxL10n.open+"'>"+TB_Image+"</a>":"download"==tb_options.click_img?TB_Image="<a href='"+c+"' class='download' title='"+thickboxL10n.download+"'>"+TB_Image+"</a>":"expand_shrink"==tb_options.click_img&&(TB_Image="<a href='' class='scalable' title='"+thickboxL10n.fit+"'>"+TB_Image+"</a>");TB_Caption="<div id='TB_caption'>"+a+"<div id='TB_secondLine'>"+TB_imageCount+TB_PrevHTML+
TB_NextHTML+"</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='"+thickboxL10n.close+"'><img src='"+tb_closeImage+"' /></a></div>";"none"!=tb_options.effect_cap&&(TB_Caption="<div id='TB_CaptionBar'>"+TB_Caption+"</div>");switch(tb_options.position_cap){case "top":jQuery("#TB_window").append(TB_Caption+TB_Image).addClass("TB_imageContent TB_captionTop");break;case "bottom":jQuery("#TB_window").append(TB_Image+TB_Caption).addClass("TB_imageContent TB_captionBottom");
break;case "none":jQuery("#TB_window").append(TB_Image).addClass("TB_imageContent")}(!b||!a)&&jQuery("#TB_window").addClass("TB_singleLine");"true"==f.modal&&jQuery("#TB_overlay").unbind();jQuery("#TB_closeWindowButton").click(tb_remove);if(""!==TB_PrevHTML){var g=function(){jQuery(document).unbind(".thickbox");jQuery("#TB_window").remove();jQuery("body").append("<div id='TB_window' class='TB_Transition'></div>");tb_show(TB_PrevCaption,TB_PrevURL,b);return!1};jQuery("#TB_prev").click(g);var h=function(){jQuery(document).unbind(".thickbox");