Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91900
Change subject: Hygiene: Address FIXME
......................................................................
Hygiene: Address FIXME
Move to more logical place
Change-Id: Icf833e6487238dfb5fcc87774890a0ed5dcd7e82
---
M includes/Resources.php
A javascripts/desktop/geonotahack.js
R javascripts/modules/nearby/PagePreviewOverlay.js
3 files changed, 35 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/00/91900/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 98fc839..52ed56e 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -675,7 +675,7 @@
'mobile.beta.common',
),
'scripts' => array(
- 'javascripts/specials/overlays/PagePreviewOverlay.js',
+ 'javascripts/modules/nearby/PagePreviewOverlay.js',
'javascripts/modules/nearby/NearbyOverlay.js',
)
),
diff --git a/javascripts/desktop/geonotahack.js
b/javascripts/desktop/geonotahack.js
new file mode 100644
index 0000000..e37c80d
--- /dev/null
+++ b/javascripts/desktop/geonotahack.js
@@ -0,0 +1,34 @@
+( function( M, $ ) {
+ $( function() {
+ var latLng = $( '.geo' ).eq( 0 ).text(), lat, lng,
+ LoadingOverlay = M.require( 'LoadingOverlay' ),
+ loader = new LoadingOverlay();
+
+ // Matches <number>;<spaces><number> where number can be
negative or positive and a float or integer
+ latLng = latLng.match( /([\-]?[\-0-9]+[\.]?[0-9]*);[
]+([\-]?[0-9]+[\.]?[0-9]*)/ );
+ if ( latLng ) {
+ lat = latLng[1];
+ lng = latLng[2];
+ }
+
+ function initNearbyButton( title, latitude, longitude ) {
+ function loadGeoNotAHack() {
+ loader.show();
+ mw.loader.using( 'mobile.nearby.beta',
function() {
+ var NearbyOverlay = M.require(
'modules/nearby/NearbyOverlay' );
+ if ( !overlay ) {
+ overlay = new NearbyOverlay( {
title: title, latitude: latitude, longitude: longitude, source: 'geonotahack' }
);
+ }
+ overlay.show();
+ } );
+ }
+
+ $( '<button class="nearby">' ).on( 'click',
loadGeoNotAHack ).appendTo( '#firstHeading' );
+ }
+
+ if ( lat && lng ) {
+ // in business!
+ initNearbyButton( mw.config.get( 'wgTitle' ), lat, lng
);
+ }
+ } );
+}( mediaWiki.mobileFrontend, jQuery ) );
diff --git a/javascripts/specials/overlays/PagePreviewOverlay.js
b/javascripts/modules/nearby/PagePreviewOverlay.js
similarity index 98%
rename from javascripts/specials/overlays/PagePreviewOverlay.js
rename to javascripts/modules/nearby/PagePreviewOverlay.js
index 1af43b2..30c490b 100644
--- a/javascripts/specials/overlays/PagePreviewOverlay.js
+++ b/javascripts/modules/nearby/PagePreviewOverlay.js
@@ -1,4 +1,3 @@
-// FIXME: Move this file somewhere more logical
( function( M, $ ) {
M.assertMode( [ 'beta', 'alpha' ] );
var Overlay = M.require( 'Overlay' ),
--
To view, visit https://gerrit.wikimedia.org/r/91900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf833e6487238dfb5fcc87774890a0ed5dcd7e82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
