jenkins-bot has submitted this change and it was merged.
Change subject: Bug alpha: Ensure heading is correct on nearby overlay
......................................................................
Bug alpha: Ensure heading is correct on nearby overlay
Currently wgTitle is binded to the first loaded page which is not
wrong when lazy loading is happening
Change-Id: If8888791ea735f6ca39095a7ad279b8eef83ea8f
---
M javascripts/modules/nearbypages.js
1 file changed, 8 insertions(+), 6 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/nearbypages.js
b/javascripts/modules/nearbypages.js
index 059f07a..b3de1ed 100644
--- a/javascripts/modules/nearbypages.js
+++ b/javascripts/modules/nearbypages.js
@@ -10,10 +10,10 @@
className: 'mw-mf-overlay list-overlay',
template: M.template.get( 'overlays/nearby' ),
defaults: {
- heading: 'Nearby',
- pretext: mw.message(
'mobile-frontend-nearby-to-page', mw.config.get( 'wgTitle' ) )
+ heading: 'Nearby'
},
initialize: function( options ) {
+ options.pretext = mw.message(
'mobile-frontend-nearby-to-page', options.title );
this._super( options );
this.latLngString = options.latitude + ',' +
options.longitude;
},
@@ -30,16 +30,18 @@
} );
- function initNearbyButton( latitude, longitude ) {
+ function initNearbyButton( title, latitude, longitude ) {
$( '<button class="nearby">' ).on( 'click', function() {
if ( !overlay ) {
- overlay = new NearbyOverlay( { latitude:
latitude, longitude: longitude } );
+ overlay = new NearbyOverlay( { title: title,
latitude: latitude, longitude: longitude } );
}
overlay.show();
} ).appendTo( '#section_0' );
}
- function init() {
+ function init( page ) {
+ // reset the overlay in case a new page was loaded
+ overlay = null;
// in form 37.783; -122.417 - take the first one
latLng = $( '.geo' ).eq( 0 ).text();
// Matches <number>;<spaces><number> where number can be
negative or positive and a float or integer
@@ -51,7 +53,7 @@
if ( lat && lng ) {
// in business!
- initNearbyButton( lat, lng );
+ initNearbyButton( page ? page.title : mw.config.get(
'wgTitle' ), lat, lng );
}
}
init();
--
To view, visit https://gerrit.wikimedia.org/r/71860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If8888791ea735f6ca39095a7ad279b8eef83ea8f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
