From d830ad1917c3665bc5362cac9703e4de9ae89add Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Fri, 19 Apr 2019 14:08:07 +0100
Subject: [PATCH] Gallery slideshow: Improve missing image and error handling

Change-Id: I6aae5801178aa66fc40d40b9dec239a34b0ee029
---
 .../src/mediawiki.page.gallery.slideshow.js   | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/resources/src/mediawiki.page.gallery.slideshow.js b/resources/src/mediawiki.page.gallery.slideshow.js
index dd52767eb2..4ea1999de6 100644
--- a/resources/src/mediawiki.page.gallery.slideshow.js
+++ b/resources/src/mediawiki.page.gallery.slideshow.js
@@ -242,24 +242,33 @@
 			.removeClass( 'slideshow-current' );
 		$imageLi.addClass( 'slideshow-current' );
 
-		// 2. Create and show thumbnail
 		this.$thumbnail = $imageLi.find( 'img' );
-		this.$img = $( '<img>' ).attr( {
-			src: this.$thumbnail.attr( 'src' ),
-			alt: this.$thumbnail.attr( 'alt' )
-		} );
-		// 'image' class required for detection by MultimediaViewer
-		$imgLink = $( '<a>' ).addClass( 'image' )
-			.attr( 'href', $imageLi.find( 'a' ).eq( 0 ).attr( 'href' ) )
-			.append( this.$img );
+		if ( this.$thumbnail.length ) {
+			// 2. Create and show thumbnail
+			this.$img = $( '<img>' ).attr( {
+				src: this.$thumbnail.attr( 'src' ),
+				alt: this.$thumbnail.attr( 'alt' )
+			} );
+			// 'image' class required for detection by MultimediaViewer
+			$imgLink = $( '<a>' ).addClass( 'image' )
+				.attr( 'href', $imageLi.find( 'a' ).eq( 0 ).attr( 'href' ) )
+				.append( this.$img );
 
-		this.$imgContainer.empty().append( $imgLink );
+			this.$imgContainer.empty().append( $imgLink );
+		} else {
+			// 2b. No image found (e.g. file doesn't exist)
+			this.$imgContainer.text( $imageLi.find( '.thumb' ).text() );
+		}
 
 		// 3. Copy caption
 		this.$imgCaption
 			.empty()
 			.append( $caption.clone() );
 
+		if ( !this.$thumbnail.length ) {
+			return;
+		}
+
 		// 4. Stretch thumbnail to correct size
 		this.setImageSize();
 
@@ -275,6 +284,10 @@
 				// Pre-fetch the next image
 				this.loadImage( this.getNextImage().find( 'img' ) );
 			}
+		}.bind( this ) ).fail( function () {
+			// Image didn't load
+			var title = mw.Title.newFromImg( this.$img );
+			this.$imgContainer.text( title ? title.getMainText() : '' );
 		}.bind( this ) );
 	};
 
-- 
2.20.1