[MediaWiki-commits] [Gerrit] Fix fullscreen bug where image was replaced with self - change (mediawiki...MultimediaViewer)

[Code Review]

Gergő Tisza has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/112835

Change subject: Fix fullscreen bug where image was replaced with self
......................................................................

Fix fullscreen bug where image was replaced with self

Change-Id: I81dcadae96a778559564a786a5753323fb802b7c
---
M resources/mmv/mmv.lightboxinterface.js
M resources/multilightbox/lightboxinterface.js
2 files changed, 9 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/35/112835/1

diff --git a/resources/mmv/mmv.lightboxinterface.js 
b/resources/mmv/mmv.lightboxinterface.js
index 27ba9ad..049af76 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -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;
@@ -177,8 +181,6 @@
                if ( !this.currentlyAttached ) {
                        return;
                }
-
-               this.viewer.resize( this );
 
                if ( this.isFullscreen ) {
                        // When entering fullscreen without a mousemove, the 
browser
diff --git a/resources/multilightbox/lightboxinterface.js 
b/resources/multilightbox/lightboxinterface.js
index da48c4a..26b0d98 100644
--- a/resources/multilightbox/lightboxinterface.js
+++ b/resources/multilightbox/lightboxinterface.js
@@ -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 );
        };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81dcadae96a778559564a786a5753323fb802b7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>

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