Nmoanta has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/339942 )
Change subject: Loops back to the start of images when at the end of collection ...................................................................... Loops back to the start of images when at the end of collection Bug: T77877 Change-Id: I5cff46dae0cb933358b35cbc5e9b388f0179573f --- M resources/mmv/mmv.js M resources/mmv/mmv.lightboxinterface.js M resources/mmv/ui/mmv.ui.canvasButtons.js 3 files changed, 16 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/42/339942/1 diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js index f7b2eee..f50d4d9 100644 --- a/resources/mmv/mmv.js +++ b/resources/mmv/mmv.js @@ -818,14 +818,19 @@ * @param {number} index */ MMVP.loadIndex = function ( index ) { - var thumb; + var thumb, newIndex = index; - if ( index < this.thumbs.length && index >= 0 ) { - this.viewLogger.recordViewDuration(); - - thumb = this.thumbs[ index ]; - this.loadImage( thumb.image, thumb.$thumb.clone()[ 0 ] ); + if ( index < 0 ) { + newIndex = this.thumbs.length - 1; } + else if ( index >= this.thumbs.length ) { + newIndex = 0; + } + + this.viewLogger.recordViewDuration(); + + thumb = this.thumbs[ newIndex ]; + this.loadImage( thumb.image, thumb.$thumb.clone()[ 0 ] ); }; /** diff --git a/resources/mmv/mmv.lightboxinterface.js b/resources/mmv/mmv.lightboxinterface.js index 9781a69..185fcef 100644 --- a/resources/mmv/mmv.lightboxinterface.js +++ b/resources/mmv/mmv.lightboxinterface.js @@ -498,7 +498,7 @@ } this.buttons.setOffset( prevNextTop ); - this.buttons.toggle( showPrevButton, showNextButton ); + this.buttons.showButtons(); }; mw.mmv.LightboxInterface = LightboxInterface; diff --git a/resources/mmv/ui/mmv.ui.canvasButtons.js b/resources/mmv/ui/mmv.ui.canvasButtons.js index ff6d64d..c525f35 100644 --- a/resources/mmv/ui/mmv.ui.canvasButtons.js +++ b/resources/mmv/ui/mmv.ui.canvasButtons.js @@ -134,14 +134,11 @@ }; /** - * Toggles buttons being disabled or not - * - * @param {boolean} showPrevButton - * @param {boolean} showNextButton + * Shows buttons being disabled */ - CBP.toggle = function ( showPrevButton, showNextButton ) { - this.$next.toggleClass( 'disabled', !showPrevButton ); - this.$prev.toggleClass( 'disabled', !showNextButton ); + CBP.showButtons = function() { + this.$next.toggleClass( 'disabled', false); + this.$prev.toggleClass( 'disabled', false); }; /** -- To view, visit https://gerrit.wikimedia.org/r/339942 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5cff46dae0cb933358b35cbc5e9b388f0179573f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Nmoanta <nicu.moa...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits