From 5dca6d14f50e0654a2092ec3c9ded1a8c59a4b20 Mon Sep 17 00:00:00 2001 From: attosoft Date: Thu, 18 Oct 2012 04:14:31 +0000 Subject: [PATCH] FIXED: `img` element is broken HTML when the caption contains both apostrophe (`'`) and greater-than sign (`>`) (ThickBox bug) --- readme.txt | 1 + thickbox.min.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index a570353..5c34635 100644 --- a/readme.txt +++ b/readme.txt @@ -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 = diff --git a/thickbox.min.js b/thickbox.min.js index 85d32d6..193cc7d 100644 --- a/thickbox.min.js +++ b/thickbox.min.js @@ -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  "+thickboxL10n.next+""):(TB_PrevCaption=TB_TempArray[TB_Counter],TB_PrevURL=TB_TempArray[TB_Counter].href,TB_PrevHTML="  "+thickboxL10n.prev+""):(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=""+a+"";"close"==tb_options.click_img||!b&&"close"==tb_options.click_end?TB_Image="";"close"==tb_options.click_img||!b&&"close"==tb_options.click_end?TB_Image=""+TB_Image+"":"open"==tb_options.click_img?TB_Image=""+TB_Image+"":"download"==tb_options.click_img?TB_Image=""+TB_Image+"":"expand_shrink"==tb_options.click_img&&(TB_Image=""+TB_Image+"");TB_Caption="
"+a+"
"+TB_imageCount+TB_PrevHTML+ TB_NextHTML+"
";"none"!=tb_options.effect_cap&&(TB_Caption="
"+TB_Caption+"
");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("
");tb_show(TB_PrevCaption,TB_PrevURL,b);return!1};jQuery("#TB_prev").click(g);var h=function(){jQuery(document).unbind(".thickbox");