jenkins-bot has submitted this change and it was merged.

Change subject: Bug 47598 Make Special:Nearby work on desktop
......................................................................


Bug 47598 Make Special:Nearby work on desktop

Why not :)
This only attaches the mobile.site module (which is target=>mobile only)
when you are in mobile

Bug: 47598
Change-Id: I3f0af4e2263ce20a4d206da83ce74fc224f6f8eb
---
M MobileFrontend.php
M includes/MobileFrontend.hooks.php
2 files changed, 2 insertions(+), 1 deletion(-)

Approvals:
  awjrichards: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/MobileFrontend.php b/MobileFrontend.php
index 38a9750..1f09d97 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -465,7 +465,6 @@
                'mobile.stable.universal',
                'mediawiki.util',
                'mobile.stable.styles',
-               'mobile.site',
        ),
        'scripts' => array(
                'javascripts/modules/mf-cleanuptemplates.js',
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index d2cc447..a91b770 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -20,6 +20,7 @@
         * @return boolean
         */
        public static function onEnableMobileModules( $out, $mode ) {
+               global $wgResourceModules;
                if ( $mode === 'alpha' && $out->getTitle()->isSpecialPage() ) {
                        $out->addModules(
                                array(
@@ -28,6 +29,7 @@
                                )
                        );
                }
+               $wgResourceModules['mobile.stable']['dependencies'][] = 
'mobile.site';
                return true;
        }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/61496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f0af4e2263ce20a4d206da83ce74fc224f6f8eb
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[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

Reply via email to