jenkins-bot has submitted this change and it was merged.
Change subject: Fix closing map by going back sometimes not working
......................................................................
Fix closing map by going back sometimes not working
Bug: T151915
Change-Id: I478719a682f4001dc089f5a7439c728c3cf623cf
---
M modules/dialog/index.js
1 file changed, 12 insertions(+), 6 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dialog/index.js b/modules/dialog/index.js
index 5de18ec..683da45 100644
--- a/modules/dialog/index.js
+++ b/modules/dialog/index.js
@@ -32,6 +32,13 @@
windowManager = null;
}
+ function closeIfNotMapRoute( routeEv ) {
+ var isMapRoute = routeEv && /^\/(map|maplink)\//.test(
routeEv.path );
+ if ( !isMapRoute ) {
+ close();
+ }
+ }
+
return {
/**
* Opens the map dialog and renders the map.
@@ -44,9 +51,9 @@
dialog = getMapDialog();
if ( map.useRouter && !routerEnabled ) {
- router.route( '', function () {
- close();
- } );
+ router.on( 'route', closeIfNotMapRoute );
+ router.route( '', closeIfNotMapRoute );
+ routerEnabled = true;
}
if ( !window.opened ) {
@@ -90,9 +97,8 @@
map = mw.loader.require(
'ext.kartographer.box' ).map( mapObject );
if ( map.useRouter && !routerEnabled ) {
- router.route( '', function () {
- close();
- } );
+ router.on( 'route',
closeIfNotMapRoute );
+ routerEnabled = true;
}
dialog.setup.call( dialog, { map: map }
);
--
To view, visit https://gerrit.wikimedia.org/r/324849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I478719a682f4001dc089f5a7439c728c3cf623cf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault <julien.inbox.w...@gmail.com>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
