From 9500297090deea048b8207240587d7c625be0c59 Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Wed, 19 Jul 2017 16:08:24 -0700
Subject: [PATCH] Don't show ImageOverlay in desktop mode - delegate to 
 multimedia viewer

Bug: T169622
Change-Id: Ie34297a56f8571b161802ea8a708a8bed37c9173
---
 resources/skins.minerva.scripts/init.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/resources/skins.minerva.scripts/init.js b/resources/skins.minerva.scripts/init.js
index 3d33fc6..d1b23b8 100644
--- a/resources/skins.minerva.scripts/init.js
+++ b/resources/skins.minerva.scripts/init.js
@@ -81,14 +81,20 @@
 	 * @return {jQuery.Deferred}
 	 */
 	function loadImageOverlay( title ) {
-		return loader.loadModule( 'mobile.mediaViewer' ).then( function () {
-			var ImageOverlay = M.require( 'mobile.mediaViewer/ImageOverlay' );
-			return new ImageOverlay( {
-				api: new mw.Api(),
-				thumbnails: thumbs,
-				title: decodeURIComponent( title )
+		if ( mw.loader.getState( 'mmv.bootstrap' ) === 'ready' ) {
+			// This means MultimediaViewer has been installed and is loaded.
+			// Avoid loading it (T169622)
+			return $.Deferred().reject();
+		} else {
+			return loader.loadModule( 'mobile.mediaViewer' ).then( function () {
+				var ImageOverlay = M.require( 'mobile.mediaViewer/ImageOverlay' );
+				return new ImageOverlay( {
+					api: new mw.Api(),
+					thumbnails: thumbs,
+					title: decodeURIComponent( title )
+				} );
 			} );
-		} );
+		}
 	}
 
 	// Routes