Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/76270
Change subject: Kill use of MobileFormatter on special pages
......................................................................
Kill use of MobileFormatter on special pages
* Stop adding #section_0 to special pages
* Re-instore search special page styling
* Stop scrubbing search elements - instead hide in css
Change-Id: I78881cd2b264ea1b3c6475238f3a3c25bce8b93f
---
M includes/MobileFrontend.hooks.php
M includes/formatters/MobileFormatter.php
M includes/skins/SkinMobile.php
M less/specials/search.less
M stylesheets/specials/search.css
5 files changed, 22 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/70/76270/1
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 2be5bbc..3005faa 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -313,12 +313,15 @@
public static function onSpecialPageBeforeExecute( SpecialPage
$special, $subpage ) {
global $wgMFForceSecureLogin;
$mobileContext = MobileContext::singleton();
- if ( $special->getName() != 'Userlogin' ||
!$mobileContext->shouldDisplayMobileView() ) {
+ $isMobileView = $mobileContext->shouldDisplayMobileView();
+ $out = $special->getContext()->getOutput();
+ if ( $special->getName() === 'Search' && $isMobileView ) {
+ $out->addModuleStyles( 'mobile.search.styles' );
+ }
+ if ( $special->getName() != 'Userlogin' || !$isMobileView ) {
// no further processing necessary
return true;
}
-
- $out = $special->getContext()->getOutput();
$out->addModuleStyles( 'mobile.userlogin.styles' );
// make sure we're on https if we're supposed to be and
currently aren't.
diff --git a/includes/formatters/MobileFormatter.php
b/includes/formatters/MobileFormatter.php
index d44b17d..c77dc46 100644
--- a/includes/formatters/MobileFormatter.php
+++ b/includes/formatters/MobileFormatter.php
@@ -17,9 +17,7 @@
private $defaultItemsToRemove = array(
'.toc',
- '#search', // remove search form element from Special:Search
'div.magnify',
- '.mw-search-createlink',
'.nomobile',
);
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index 22838b5..d686b89 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -34,6 +34,7 @@
if ( $wgMFNoindexPages ) {
$out->setRobotPolicy( 'noindex,nofollow' );
}
+ $ns = $out->getTitle()->getNamespace();
$options = null;
if ( wfRunHooks( 'BeforePageDisplayMobile', array( &$out,
&$options ) ) ) {
@@ -41,7 +42,11 @@
$this->hookOptions = $options;
}
}
- $html = $this->extMobileFrontend->DOMParse( $out );
+ if ( $ns !== NS_SPECIAL ) {
+ $html = $this->extMobileFrontend->DOMParse( $out );
+ } else {
+ $html = $out->getHtml();
+ }
wfProfileIn( __METHOD__ . '-tpl' );
$tpl = $this->prepareTemplate();
diff --git a/less/specials/search.less b/less/specials/search.less
index 13fdffc..b9f4ef9 100644
--- a/less/specials/search.less
+++ b/less/specials/search.less
@@ -19,3 +19,9 @@
}
}
}
+
+.mw-search-createlink,
+// FIXME: Revisit when search input is not in a table
+#search {
+ display: none;
+}
diff --git a/stylesheets/specials/search.css b/stylesheets/specials/search.css
index e0b3048..46f5a88 100644
--- a/stylesheets/specials/search.css
+++ b/stylesheets/specials/search.css
@@ -19,3 +19,7 @@
width: 100%;
margin-left: 12px;
}
+.mw-search-createlink,
+#search {
+ display: none;
+}
--
To view, visit https://gerrit.wikimedia.org/r/76270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78881cd2b264ea1b3c6475238f3a3c25bce8b93f
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
