jenkins-bot has submitted this change and it was merged.
Change subject: Story 477: Only show nearby in menu when supported
......................................................................
Story 477: Only show nearby in menu when supported
Change-Id: I106282a302bfdc870b225b85b8b000f65fac4674
---
M javascripts/common/mf-application.js
M javascripts/modules/mainmenutweaks.js
M javascripts/specials/nearby.js
3 files changed, 9 insertions(+), 1 deletion(-)
Approvals:
awjrichards: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/common/mf-application.js
b/javascripts/common/mf-application.js
index 3275f56..e192834 100644
--- a/javascripts/common/mf-application.js
+++ b/javascripts/common/mf-application.js
@@ -86,6 +86,10 @@
return support;
}
+ function supportsGeoLocation() {
+ return !!navigator.geolocation;
+ }
+
// Try to scroll and hide URL bar
scrollY = window.scrollY || 0;
if( !window.location.hash && scrollY < 10 ) {
@@ -215,6 +219,7 @@
message: message,
on: on,
prefix: 'mw-mf-',
+ supportsGeoLocation: supportsGeoLocation,
supportsPositionFixed: supportsPositionFixed,
triggerPageReadyHook: triggerPageReadyHook,
prettyEncodeTitle: prettyEncodeTitle,
diff --git a/javascripts/modules/mainmenutweaks.js
b/javascripts/modules/mainmenutweaks.js
index d8d22c8..ea5abd8 100644
--- a/javascripts/modules/mainmenutweaks.js
+++ b/javascripts/modules/mainmenutweaks.js
@@ -10,5 +10,8 @@
// to users who haven't uploaded anything to make the page
useful.
$( '#mw-mf-menu-main li.icon-uploads' ).remove();
}
+ if ( !M.supportsGeoLocation() ) {
+ $( '#mw-mf-menu-main li.icon-nearby' ).remove();
+ }
} )( mw.mobileFrontend, jQuery );
diff --git a/javascripts/specials/nearby.js b/javascripts/specials/nearby.js
index de8af5a..9f155a5 100644
--- a/javascripts/specials/nearby.js
+++ b/javascripts/specials/nearby.js
@@ -1,7 +1,7 @@
( function( M, $ ) {
( function() {
- var supported = !!navigator.geolocation,
+ var supported = M.supportsGeoLocation(),
popup = M.require( 'notifications' ),
View = M.require( 'view' ),
cachedPages,
--
To view, visit https://gerrit.wikimedia.org/r/61386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I106282a302bfdc870b225b85b8b000f65fac4674
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: awjrichards <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
