mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer
synced 2024-11-12 09:27:36 +00:00
Merge "Fix fullscreen bug where image was replaced with self"
This commit is contained in:
commit
52a0e16147
|
@ -156,6 +156,10 @@
|
|||
};
|
||||
|
||||
LIP.replaceImageWith = function ( imageEle ) {
|
||||
if ( this.$image.is( imageEle ) ) { // http://bugs.jquery.com/ticket/4087
|
||||
return;
|
||||
}
|
||||
|
||||
var $image = $( imageEle );
|
||||
|
||||
this.currentImage.src = imageEle.src;
|
||||
|
@ -178,8 +182,6 @@
|
|||
return;
|
||||
}
|
||||
|
||||
this.viewer.resize( this );
|
||||
|
||||
if ( this.isFullscreen ) {
|
||||
// When entering fullscreen without a mousemove, the browser
|
||||
// still thinks that the cursor is where it was prior to entering
|
||||
|
|
|
@ -85,6 +85,7 @@
|
|||
|
||||
if ( this.resizeListener ) {
|
||||
window.removeEventListener( 'resize', this.resizeListener );
|
||||
this.resizeListener = null;
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -167,9 +168,10 @@
|
|||
|
||||
// Capture listener so we can remove it later, otherwise
|
||||
// we are going to leak listeners !
|
||||
this.resizeListener = function () { iface.resizeCallback(); };
|
||||
|
||||
window.addEventListener( 'resize', this.resizeListener );
|
||||
if ( !this.resizeListener ) {
|
||||
this.resizeListener = function () { iface.resizeCallback(); };
|
||||
window.addEventListener( 'resize', this.resizeListener );
|
||||
}
|
||||
|
||||
lightboxHooks.callAll( 'imageLoaded', this );
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue