Merge pull request #247 from patricksnape/issue_235

Fixes issue #235 by adding an onerror function
honestbleeps · Feb 13, 2013 · b91fac5 · b91fac5
2 parents bd52d9b + 3bd5c49
commit b91fac5
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/reddit_enhancement_suite.user.js b/lib/reddit_enhancement_suite.user.js
@@ -9255,6 +9255,7 @@ modules['showImages'] = {
 		var thisSrc = (imageLink.type == 'IMAGE_SCRAPE') ? imageLink.getAttribute('scraped_src') : imageLink.src;
 		$(imageAnchor).html('<img title="drag to resize" class="RESImage" style="max-width:'+this.options.maxWidth.value+'px;max-height:'+this.options.maxHeight.value+'px;" src="' + thisSrc + '" />');
 		var image = imageAnchor.querySelector('IMG');
+		image.onerror = imageLink.onerror;
 
 		if ('credits' in imageLink) {
 			var credits = document.createElement('div');
@@ -9825,6 +9826,13 @@ modules['showImages'] = {
 				if (RESUtils.pageType() == 'linklist') {
 					$(elem).closest('.thing').find('.thumbnail').attr('href',elem.href);
 				}
+				elem.onerror = function() {
+				    if (this.src.match(/\.jpg/)) {
+				        this.src = this.src.slice(0, elem.src.length - 3) + 'png';
+				    } else if (this.src.match(/\.png/)) {
+				        this.src = this.src.slice(0, elem.src.length - 3) + 'gif';
+				    }
+				}
 				modules['showImages'].createImageExpando(elem);
 			}
 		},