Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/63822
Change subject: Bug 48490: Report correct mode and whether to disable images or
not
......................................................................
Bug 48490: Report correct mode and whether to disable images or not
Move definition of wgMFMode into application.js
Move wgImagesDisabled into makeGlobalVariablesScript so it gets
added to HTML rather than JS which doesn't vary
Change-Id: Ic5f45299e57fa55f1b95ca1753a488b9c4bf7b18
---
M includes/MobileFrontend.hooks.php
M includes/skins/SkinMobile.php
M javascripts/common/mf-application.js
3 files changed, 23 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/22/63822/1
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index f24b475..8a3f4f5 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -79,6 +79,11 @@
$vars[ 'wgIsPageEditable' ] = $user->isAllowed( 'edit'
) && $title->getNamespace() == NS_MAIN;
$vars[ 'wgPreferredVariant' ] =
$title->getPageLanguage()->getPreferredVariant();
+ $ctx = MobileContext::singleton();
+ // mobile specific config variables
+ if ( $ctx->shouldDisplayMobileView() ) {
+ $vars[ 'wgImagesDisabled' ] =
$ctx->imagesDisabled();
+ }
}
return true;
@@ -310,18 +315,6 @@
);
$vars['wgStopMobileRedirectCookie'] =
$wgStopMobileRedirectCookie;
$vars['wgMFNearbyEndpoint'] = $wgMFNearbyEndpoint;
- // mobile specific config variables
- if ( $ctx->shouldDisplayMobileView() ) {
- $vars[ 'wgImagesDisabled' ] = $ctx->imagesDisabled();
- if ( $ctx->isAlphaGroupMember() ) {
- $env = 'alpha';
- } else if ( $ctx->isBetaGroupMember() ) {
- $env = 'beta';
- } else {
- $env = 'stable';
- }
- $vars[ 'wgMFMode' ] = $env;
- }
return true;
}
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index b0155f7..5028725 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -3,6 +3,16 @@
class SkinMobile extends SkinMobileBase {
public $template = 'SkinMobileTemplate';
+ public function __construct( $mf ) {
+ $ctx = MobileContext::singleton();
+ if ( $ctx->isAlphaGroupMember() ) {
+ $this->skinname = 'minerva-alpha';
+ } else if ( $ctx->isBetaGroupMember() ) {
+ $this->skinname = 'minerva-beta';
+ }
+ parent::__construct( $mf );
+ }
+
protected function prepareTemplate() {
global $wgAppleTouchIcon;
diff --git a/javascripts/common/mf-application.js
b/javascripts/common/mf-application.js
index 6a2c25e..ee23735 100644
--- a/javascripts/common/mf-application.js
+++ b/javascripts/common/mf-application.js
@@ -100,8 +100,16 @@
function init() {
// FIXME: use wgIsMainPage
var mainPage = document.getElementById( 'mainpage' ),
+ mode, $body = $( 'body' ),
$doc = $( 'html' );
+ if ( $body.hasClass( 'alpha' ) ) {
+ mode = 'alpha';
+ } else {
+ mode = $body.hasClass( 'beta' ) ? 'beta' : 'stable';
+ }
+ mw.config.set( 'wgMFMode', mode );
+
if ( mainPage ) {
emit( 'homepage-loaded' );
}
--
To view, visit https://gerrit.wikimedia.org/r/63822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5f45299e57fa55f1b95ca1753a488b9c4bf7b18
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
