Merge "Don't show ImageOverlay in desktop mode - delegate to multimedia viewer"
This commit is contained in:
commit
ed427dd427
|
@ -81,14 +81,20 @@
|
||||||
* @return {jQuery.Deferred}
|
* @return {jQuery.Deferred}
|
||||||
*/
|
*/
|
||||||
function loadImageOverlay( title ) {
|
function loadImageOverlay( title ) {
|
||||||
return loader.loadModule( 'mobile.mediaViewer' ).then( function () {
|
if ( mw.loader.getState( 'mmv.bootstrap' ) === 'ready' ) {
|
||||||
var ImageOverlay = M.require( 'mobile.mediaViewer/ImageOverlay' );
|
// This means MultimediaViewer has been installed and is loaded.
|
||||||
return new ImageOverlay( {
|
// Avoid loading it (T169622)
|
||||||
api: new mw.Api(),
|
return $.Deferred().reject();
|
||||||
thumbnails: thumbs,
|
} else {
|
||||||
title: decodeURIComponent( 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 )
|
||||||
|
} );
|
||||||
} );
|
} );
|
||||||
} );
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Routes
|
// Routes
|
||||||
|
|
Loading…
Reference in New Issue