wikimedia/mediawiki-extensions-MultimediaViewer
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer synced 2024-11-23 15:56:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "mmv.js: Store comingFromHashChange as a class property""

Browse source
This commit is contained in:
jenkins-bot 2024-11-13 23:17:05 +00:00 committed by Gerrit Code Review
parent 7dc0f3d573 2e4bd06f6b
commit a0403ff80e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
resources/mmv/mmv.js
View file

@ -44,6 +44,7 @@ const ThumbnailWidthCalculator = require( './mmv.ThumbnailWidthCalculator.js' );
const { extensions, useThumbnailGuessing } = require( './config.json' ); const { extensions, useThumbnailGuessing } = require( './config.json' );
const router = require( 'mediawiki.router' ); const router = require( 'mediawiki.router' );
let comingFromHashChange = false;
/** /**
* Analyses the page, looks for image content and sets up the hooks * Analyses the page, looks for image content and sets up the hooks
@ -95,7 +96,7 @@ class MultimediaViewer {
*/ */
this.router = router; this.router = router;
this.setupRouter(); this.setupRouter();
this.comingFromHashChange = false; comingFromHashChange = false;
/** /**
* UI object used to display the pictures in the page. * UI object used to display the pictures in the page.
@ -685,8 +686,8 @@ class MultimediaViewer {
this.viewLogger.recordViewDuration(); this.viewLogger.recordViewDuration();
this.viewLogger.unattach(); this.viewLogger.unattach();
if ( this.comingFromHashChange ) { if ( comingFromHashChange ) {
this.comingFromHashChange = false; comingFromHashChange = false;
} else { } else {
this.router.back(); this.router.back();
} }
@ -706,7 +707,7 @@ class MultimediaViewer {
// handle empty hashes, and anchor links (page sections, possibly including /) // handle empty hashes, and anchor links (page sections, possibly including /)
this.router.addRoute( /.*$/, () => { this.router.addRoute( /.*$/, () => {
if ( this.isOpen ) { if ( this.isOpen ) {
this.comingFromHashChange = true; comingFromHashChange = true;
document.title = this.createDocumentTitle( null ); document.title = this.createDocumentTitle( null );
if ( this.ui ) { if ( this.ui ) {
// FIXME triggers mmv-close event, which calls viewer.close() // FIXME triggers mmv-close event, which calls viewer.close()