wikimedia/mediawiki-extensions-MultimediaViewer
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer synced 2024-11-29 02:14:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix fullscreen bug where image was replaced with self"

Browse source
This commit is contained in:
jenkins-bot 2014-02-13 09:14:18 +00:00 committed by Gerrit Code Review
parent c99d830d25 d7706d7cb0
commit 52a0e16147
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/mmv/mmv.lightboxinterface.js
View file

@ -156,6 +156,10 @@
}; };
LIP.replaceImageWith = function ( imageEle ) { LIP.replaceImageWith = function ( imageEle ) {
if ( this.$image.is( imageEle ) ) { // http://bugs.jquery.com/ticket/4087
return;
}
var $image = $( imageEle ); var $image = $( imageEle );
this.currentImage.src = imageEle.src; this.currentImage.src = imageEle.src;
@ -178,8 +182,6 @@
return; return;
} }
this.viewer.resize( this );
if ( this.isFullscreen ) { if ( this.isFullscreen ) {
// When entering fullscreen without a mousemove, the browser // When entering fullscreen without a mousemove, the browser
// still thinks that the cursor is where it was prior to entering // still thinks that the cursor is where it was prior to entering

4
resources/multilightbox/lightboxinterface.js
View file

@ -85,6 +85,7 @@
if ( this.resizeListener ) { if ( this.resizeListener ) {
window.removeEventListener( 'resize', this.resizeListener ); window.removeEventListener( 'resize', this.resizeListener );
this.resizeListener = null;
} }
}; };
@ -167,9 +168,10 @@
// Capture listener so we can remove it later, otherwise // Capture listener so we can remove it later, otherwise
// we are going to leak listeners ! // we are going to leak listeners !
if ( !this.resizeListener ) {
this.resizeListener = function () { iface.resizeCallback(); }; this.resizeListener = function () { iface.resizeCallback(); };
window.addEventListener( 'resize', this.resizeListener ); window.addEventListener( 'resize', this.resizeListener );
}
lightboxHooks.callAll( 'imageLoaded', this ); lightboxHooks.callAll( 'imageLoaded', this );
}; };