From b636282a84585025a0ee5edee8949a371a7b8140 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 26 Oct 2011 12:46:19 +0800 Subject: [PATCH 1/2] for matching .png.JPG as jpeg --- assets/jquery.imageCache.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/jquery.imageCache.js b/assets/jquery.imageCache.js index 7694edf..4b9867c 100644 --- a/assets/jquery.imageCache.js +++ b/assets/jquery.imageCache.js @@ -40,9 +40,9 @@ var ctx = canvas.getContext('2d'); ctx.drawImage(img, 0, 0); - var imgType = img.src.match(/(jpg|jpeg|png)/); + var imgType = img.src.match(/\.(jpg|jpeg|png)$/i); if (imgType && imgType.length) { - imgType = imgType[0] == 'jpg' ? 'jpeg' : imgType[0]; + imgType = imgType[0].toLowerCase() == 'jpg' ? 'jpeg' : imgType[0].toLowerCase(); } else { throw 'Invalid image type for canvas encoder: ' + img.src; } From 1f38b62157a2279029769aa5983c6a076f640fe4 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 26 Oct 2011 12:56:49 +0800 Subject: [PATCH 2/2] Update assets/jquery.imageCache.js --- assets/jquery.imageCache.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/jquery.imageCache.js b/assets/jquery.imageCache.js index 4b9867c..176831b 100644 --- a/assets/jquery.imageCache.js +++ b/assets/jquery.imageCache.js @@ -42,7 +42,7 @@ var imgType = img.src.match(/\.(jpg|jpeg|png)$/i); if (imgType && imgType.length) { - imgType = imgType[0].toLowerCase() == 'jpg' ? 'jpeg' : imgType[0].toLowerCase(); + imgType = imgType[1].toLowerCase() == 'jpg' ? 'jpeg' : imgType[1].toLowerCase(); } else { throw 'Invalid image type for canvas encoder: ' + img.src; }