[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Don't show ImageOverlay in desktop mode - delegate to multi...

2017-07-27 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/366482 )

Change subject: Don't show ImageOverlay in desktop mode - delegate to  
multimedia viewer
..


Don't show ImageOverlay in desktop mode - delegate to  multimedia viewer

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

Approvals:
  Matthias Mullie: Looks good to me, approved
  jenkins-bot: Verified
  Jdlrobson: Looks good to me, approved



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

-- 
To view, visit https://gerrit.wikimedia.org/r/366482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie34297a56f8571b161802ea8a708a8bed37c9173
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Matthias Mullie 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Don't show ImageOverlay in desktop mode - delegate to multi...

2017-07-19 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366482 )

Change subject: Don't show ImageOverlay in desktop mode - delegate to  
multimedia viewer
..

Don't show ImageOverlay in desktop mode - delegate to  multimedia viewer

Bug: T169622
Change-Id: Ie34297a56f8571b161802ea8a708a8bed37c9173
---
M resources/skins.minerva.scripts/init.js
1 file changed, 14 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/82/366482/1

diff --git a/resources/skins.minerva.scripts/init.js 
b/resources/skins.minerva.scripts/init.js
index 3d33fc6..6b817ab 100644
--- a/resources/skins.minerva.scripts/init.js
+++ b/resources/skins.minerva.scripts/init.js
@@ -78,17 +78,23 @@
 * @ignore
 * @uses ImageOverlay
 * @param {string} title Url of image
-* @return {jQuery.Deferred}
+* @return {jQuery.Deferred|False}
 */
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

-- 
To view, visit https://gerrit.wikimedia.org/r/366482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie34297a56f8571b161802ea8a708a8bed37c9173
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits