jenkins-bot has submitted this change and it was merged.
Change subject: Bug 49214: Reinstate refresh button on nearby
......................................................................
Bug 49214: Reinstate refresh button on nearby
Change-Id: I1c62dd73e9cd2d8a1c1cda9a344a6b22d5f714d8
---
M javascripts/common/mf-navigation.js
M javascripts/specials/nearby.js
2 files changed, 7 insertions(+), 9 deletions(-)
Approvals:
JGonera: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/common/mf-navigation.js
b/javascripts/common/mf-navigation.js
index ffaf7fe..4da8d70 100644
--- a/javascripts/common/mf-navigation.js
+++ b/javascripts/common/mf-navigation.js
@@ -6,10 +6,6 @@
mfePrefix = M.prefix,
inBeta = mw.config.get( 'wgMFMode' ) === 'beta';
- function getPageMenu() {
- return $( '#mw-mf-menu-page' );
- }
-
function openNavigation() {
$( 'body' ).addClass( 'navigation-enabled' );
}
@@ -72,7 +68,6 @@
};
return {
- getPageMenu: getPageMenu,
getMenu: menu
};
}( jQuery ));
diff --git a/javascripts/specials/nearby.js b/javascripts/specials/nearby.js
index a6cd810..cc03066 100644
--- a/javascripts/specials/nearby.js
+++ b/javascripts/specials/nearby.js
@@ -35,8 +35,8 @@
$( function() {
var supported = M.supportsGeoLocation(),
- nav = M.require( 'navigation' ),
View = M.require( 'view' ),
+ $userBtn = $( '#user-button' ),
errorMessages = {
empty: {
heading: mw.msg(
'mobile-frontend-nearby-noresults' ),
@@ -85,7 +85,7 @@
self.emit( 'rendered', this.$el );
}
} ),
- pendingQuery = false, btn, menu;
+ pendingQuery = false, btn;
overlay = new Nearby( {
el: $( '#mw-mf-nearby' )
@@ -244,8 +244,11 @@
overlay.renderError( 'incompatible' );
}
- menu = $( '<li>' ).appendTo( nav.getPageMenu() );
- btn = $( '<button class="refresh">refresh</button></li>' ).on( 'click',
refresh ).appendTo( menu );
+ if ( $userBtn.length ) {
+ $( '<ul id="mw-mf-menu-page">' ).insertAfter( $userBtn );
+ $userBtn.remove();
+ }
+ btn = $( '<li><button class="refresh">refresh</button></li>' ).on(
'click', refresh ).appendTo( '#mw-mf-menu-page' );
} );
M.define( 'nearby', {
--
To view, visit https://gerrit.wikimedia.org/r/67164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c62dd73e9cd2d8a1c1cda9a344a6b22d5f714d8
Gerrit-PatchSet: 6
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
