jenkins-bot has submitted this change and it was merged.
Change subject: Output unchanged main page instead of nothing if no special
cased ids
......................................................................
Output unchanged main page instead of nothing if no special cased ids
Change-Id: I6afebbafac7b0a05a2c6ecfd883cc90be7d57bde
---
M MobileFrontend.i18n.php
M includes/Resources.php
M includes/formatters/MobileFormatter.php
M includes/skins/SkinMobile.php
D javascripts/modules/mf-homepage.js
5 files changed, 9 insertions(+), 43 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
Jdlrobson: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php
index 3fd18d6..fb512d7 100644
--- a/MobileFrontend.i18n.php
+++ b/MobileFrontend.i18n.php
@@ -39,7 +39,6 @@
'mobile-frontend-back-to-top-of-section' => 'Jump back a section',
'mobile-frontend-close-section' => 'Close this section',
- 'mobile-frontend-empty-homepage-text' => 'This homepage needs to be
configured.
[https://www.mediawiki.org/wiki/Mobile_Gateway/Mobile_homepage_formatting
Instructions on how to get this site mobile enabled]',
'mobile-frontend-regular-site' => 'Desktop view',
'mobile-frontend-wml-continue' => 'Continue...',
'mobile-frontend-wml-back' => 'Back...',
diff --git a/includes/Resources.php b/includes/Resources.php
index aa49bf2..9fb707e 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -77,26 +77,6 @@
'group' => 'other',
),
- 'mobile.mainpage.plumbing' => array(
- 'messages' => array(
- // mf-homepage.js
- 'mobile-frontend-empty-homepage-text' => array( 'parse'
),
- ),
- 'class' => 'MFResourceLoaderModule',
- 'group' => 'other',
- ),
-
- 'mobile.mainpage.scripts' => $wgMFMobileResourceBoilerplate + array(
- 'dependencies' => array(
- 'mobile.startup',
- 'mobile.mainpage.plumbing',
- ),
- 'scripts' => array(
- 'javascripts/modules/mf-homepage.js',
- ),
- 'group' => 'other',
- ),
-
// Filepages
'mobile.file.styles' => $wgMFMobileResourceBoilerplate + array(
'dependencies' => array( 'mobile.startup' ),
diff --git a/includes/formatters/MobileFormatter.php
b/includes/formatters/MobileFormatter.php
index 414f253..bd65783 100644
--- a/includes/formatters/MobileFormatter.php
+++ b/includes/formatters/MobileFormatter.php
@@ -225,7 +225,7 @@
/**
* Performs transformations specific to main page
* @param DOMDocument $mainPage: Tree to process
- * @return DOMElement
+ * @return DOMElement|null
*/
protected function parseMainPage( DOMDocument $mainPage ) {
wfProfileIn( __METHOD__ );
@@ -242,11 +242,6 @@
$content = $mainPage->createElement( 'div' );
$content->setAttribute( 'id', 'mainpage' );
-
- // FIXME: Move to ZeroRatedMobileAccess extension
- if ( $zeroLandingPage ) {
- $content->appendChild( $zeroLandingPage );
- }
if ( $featuredArticle ) {
$h2FeaturedArticle = $mainPage->createElement( 'h2',
$this->msg( 'mobile-frontend-featured-article' ) );
@@ -278,6 +273,14 @@
}
}
}
+ if ( $content->childNodes->length == 0 ) {
+ $content = null;
+ } else {
+ // FIXME: Move to ZeroRatedMobileAccess extension
+ if ( $zeroLandingPage ) {
+ $content->appendChild( $zeroLandingPage );
+ }
+ }
wfProfileOut( __METHOD__ );
return $content;
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index 74e1ab5..69b1222 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -131,11 +131,6 @@
$modules = parent::getDefaultModules();
- // main page special casing
- if ( $this->getTitle()->isMainPage() ) {
- $modules['mainpage'] = array( 'mobile.mainpage.scripts'
);
- }
-
// flush unnecessary modules
$modules['content'] = array();
$modules['legacy'] = array();
diff --git a/javascripts/modules/mf-homepage.js
b/javascripts/modules/mf-homepage.js
deleted file mode 100644
index 80a891c..0000000
--- a/javascripts/modules/mf-homepage.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// special casing for homepage
-( function( $ ) {
-
-$( function() {
- $( 'h1.section_0' ).remove();
- if ( $( '#mainpage' ).children().length === 0 || $( '#content'
).children().length === 0 ) {
- $( '<div class="alert warning">' ).html( mw.msg(
'mobile-frontend-empty-homepage-text' ) ).prependTo( '#content_wrapper' );
- }
-} );
-
-} ( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/72639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6afebbafac7b0a05a2c6ecfd883cc90be7d57bde
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
