Merge pull request #12437 from Wikia/FAN-1665-resize-recirc-images

FAN-1665 Resize Fandom images in recirculation modules
Wikia · Feb 17, 2017 · 4e765a8 · 4e765a8
2 parents e433efa + bcfdba7
commit 4e765a8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/extensions/wikia/Recirculation/js/helpers/LiftigniterHelper.js b/extensions/wikia/Recirculation/js/helpers/LiftigniterHelper.js
@@ -58,10 +58,12 @@ define('ext.wikia.recirculation.helpers.liftigniter', [
 					item.meta = options.widget;
 					item.index = index;
 
-                    if (item.source === 'wiki') {
-                        item.isWiki = true;
-                        item.thumbnail = thumbnailer.getThumbURL(item.thumbnail, 'image', options.width, options.height);
-                    }
+					if (item.source === 'wiki') {
+						item.isWiki = true;
+					}
+					if (thumbnailer.isThumbUrl(item.thumbnail)) {
+						item.thumbnail = thumbnailer.getThumbURL(item.thumbnail, 'image', options.width, options.height);
+					}
 
 					items.push(item);
 				}

diff --git a/extensions/wikia/Recirculation/styles/impact-footer.scss b/extensions/wikia/Recirculation/styles/impact-footer.scss
@@ -25,7 +25,7 @@ $recirculation-impact-footer-color-feature-overlay: rgba(0, 0, 0, .75);
 	img {
 		background: $color-page;
 		display: block;
-		max-width: 100%;
+		width: 100%;
 	}
 
 	.items {

diff --git a/resources/wikia/modules/thumbnailer.js b/resources/wikia/modules/thumbnailer.js
@@ -17,7 +17,9 @@
 		var extRegExp = /\.(jpg|jpeg|gif|bmp|png|svg)$/i,
 			imagePath = '/images/',
 			legacyThumbnailerPath = '/images/thumb/',
-			thumbnailerBaseURLRegex = /(.*\/revision\/\w+).*/;
+			// [0-9a-f-]{36} is to match UUIDs like in
+			// https://vignette.wikia.nocookie.net/ff8b7617-46fa-4efb-ac2f-ff98edf04bcf
+			thumbnailerBaseURLRegex = new RegExp('(.*/revision/\\w+|.*/[0-9a-f-]{36}).*');
 
 		/**
 		 * Converts the URL of a full size image or of a thumbnail into one of a thumbnail of