Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/172953
Change subject: Make sure that the metadata panel isn't expanded by default in IE ...................................................................... Make sure that the metadata panel isn't expanded by default in IE Also fixes issue where stale scroll state from previous image could be memorised and recalled when closing/reopening MV. Change-Id: Id29c7b28887afebcb742f49b4d7c20e1210e6c1d Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/996 --- M resources/mmv/mmv.lightboxinterface.js M resources/mmv/ui/mmv.ui.metadataPanel.js M resources/mmv/ui/mmv.ui.metadataPanelScroller.js 3 files changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/53/172953/1 diff --git a/resources/mmv/mmv.lightboxinterface.js b/resources/mmv/mmv.lightboxinterface.js index 2850671..0eac0bf 100644 --- a/resources/mmv/mmv.lightboxinterface.js +++ b/resources/mmv/mmv.lightboxinterface.js @@ -224,11 +224,12 @@ LIP.unattach = function () { mw.mmv.actionLogger.log( 'close' ); + // Has to happen first so that the scroller can freeze with visible elements + this.panel.unattach(); + this.$wrapper.detach(); this.currentlyAttached = false; - - this.panel.unattach(); this.canvas.unattach(); diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js b/resources/mmv/ui/mmv.ui.metadataPanel.js index 793a6ff..e845ca0 100644 --- a/resources/mmv/ui/mmv.ui.metadataPanel.js +++ b/resources/mmv/ui/mmv.ui.metadataPanel.js @@ -83,6 +83,8 @@ }; MPP.unattach = function() { + this.scroller.freezeHeight(); + this.$title.add( this.title.$ellipsis ).tipsy( 'hide' ); this.$authorAndSource.add( this.creditField.$ellipsis ).tipsy( 'hide' ); diff --git a/resources/mmv/ui/mmv.ui.metadataPanelScroller.js b/resources/mmv/ui/mmv.ui.metadataPanelScroller.js index 57fbf5b..8394021 100644 --- a/resources/mmv/ui/mmv.ui.metadataPanelScroller.js +++ b/resources/mmv/ui/mmv.ui.metadataPanelScroller.js @@ -114,6 +114,10 @@ * unfreezeHeight after the panel has been populeted with the new metadata. */ MPSP.freezeHeight = function () { + if ( !this.$container.is( ':visible' ) ) { + return; + } + var scrollTop = $.scrollTo().scrollTop(), scrollTopWhenOpen = this.getScrollTopWhenOpen(); @@ -122,6 +126,10 @@ }; MPSP.unfreezeHeight = function () { + if ( !this.$container.is( ':visible' ) ) { + return; + } + this.$container.css( 'min-height', '' ); if ( this.panelWasFullyOpen ) { $.scrollTo( this.getScrollTopWhenOpen() ); -- To view, visit https://gerrit.wikimedia.org/r/172953 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id29c7b28887afebcb742f49b4d7c20e1210e6c1d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Gilles <gdu...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
