Restore desktop MMV
Changes in the MultimediaViewer extension mean Minerva's onClick event is preventing the default of the click handler in MultimediaViewer. Explicitly do not setup our multimedia viewer version when the desktop MMV is present! Bug: T227034 Change-Id: I94e22d045346d53bb2c50035281398799fb6c7ac
This commit is contained in:
parent
8dbd511e88
commit
afecb58a88
|
@ -18,6 +18,7 @@
|
||||||
ToggleList = require( '../../components/ToggleList/ToggleList.js' ),
|
ToggleList = require( '../../components/ToggleList/ToggleList.js' ),
|
||||||
router = require( 'mediawiki.router' ),
|
router = require( 'mediawiki.router' ),
|
||||||
CtaDrawer = mobile.CtaDrawer,
|
CtaDrawer = mobile.CtaDrawer,
|
||||||
|
desktopMMV = mw.loader.getState( 'mmv.bootstrap' ),
|
||||||
Button = mobile.Button,
|
Button = mobile.Button,
|
||||||
Anchor = mobile.Anchor,
|
Anchor = mobile.Anchor,
|
||||||
overlayManager = require( './overlayManager.js' ),
|
overlayManager = require( './overlayManager.js' ),
|
||||||
|
@ -122,7 +123,10 @@
|
||||||
initButton();
|
initButton();
|
||||||
} );
|
} );
|
||||||
|
|
||||||
mw.hook( 'wikipage.content' ).add( initMediaViewer );
|
// If the MMV module is missing or disabled from the page, initialise our version
|
||||||
|
if ( desktopMMV === null || desktopMMV === 'registered' ) {
|
||||||
|
mw.hook( 'wikipage.content' ).add( initMediaViewer );
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialisation function for last modified module.
|
* Initialisation function for last modified module.
|
||||||
|
|
Loading…
Reference in New Issue