From b5ed0e6c04ca0a99ccefa12923622ccf28cfd009 Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Wed, 23 Oct 2024 18:51:34 +0100 Subject: [PATCH] mmv.js: Store comingFromHashChange as a class property Code in mmv.bootstrap.js sets viewer.comingFromHashChange directly, assuming it to be a class property, not a local variable. Change-Id: I8b10243768118e84d916f50f1a48ff10463d1db4 --- resources/mmv/mmv.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js index d2c4a4150..4636187c5 100644 --- a/resources/mmv/mmv.js +++ b/resources/mmv/mmv.js @@ -44,7 +44,6 @@ const ThumbnailWidthCalculator = require( './mmv.ThumbnailWidthCalculator.js' ); const { extensions, useThumbnailGuessing } = require( './config.json' ); const router = require( 'mediawiki.router' ); -let comingFromHashChange = false; /** * Analyses the page, looks for image content and sets up the hooks @@ -96,7 +95,7 @@ class MultimediaViewer { */ this.router = router; this.setupRouter(); - comingFromHashChange = false; + this.comingFromHashChange = false; /** * UI object used to display the pictures in the page. @@ -686,8 +685,8 @@ class MultimediaViewer { this.viewLogger.recordViewDuration(); this.viewLogger.unattach(); - if ( comingFromHashChange ) { - comingFromHashChange = false; + if ( this.comingFromHashChange ) { + this.comingFromHashChange = false; } else { this.router.back(); } @@ -707,7 +706,7 @@ class MultimediaViewer { // handle empty hashes, and anchor links (page sections, possibly including /) this.router.addRoute( /.*$/, () => { if ( this.isOpen ) { - comingFromHashChange = true; + this.comingFromHashChange = true; document.title = this.createDocumentTitle( null ); if ( this.ui ) { // FIXME triggers mmv-close event, which calls viewer.close()