Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/143062
Change subject: Minerva Desktop: Remove toggling and fix TOC
......................................................................
Minerva Desktop: Remove toggling and fix TOC
Set target for toggling module to prevent to show "pseudo-toggling" sections
on desktop Minerva skin without function.
Add workaround to display TOC on desktop mobile where it has to be (remove
parser toc and add our mobile-toc).
Bug: 67101
Bug: 67105
Change-Id: I46d9a2eac632bb67b5a7f9c040b718abe2258b04
---
M includes/Resources.php
M includes/skins/SkinMinerva.php
M javascripts/modules/toc/toc.js
3 files changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/62/143062/1
diff --git a/includes/Resources.php b/includes/Resources.php
index b68dc8e..afeec20 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -760,6 +760,7 @@
'scripts' => array(
'javascripts/modules/toggling/toggle.js',
),
+ 'targets' => 'mobile',
),
'mobile.contentOverlays' => $wgMFMobileResourceBoilerplate + array(
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 3a6a2b9..63cb38a 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -790,6 +790,7 @@
$vars['wgMFShowRedLinks'] = (
$this->mobileContext->isBetaGroupMember() && $wgMFShowRedLinks )
|| ( $wgMFShowRedLinksAnon && $user->isAnon() );
$vars['wgTOC'] = $this->getOutput()->getProperty( 'MinervaTOC'
);
+ $vars['wgNoToggleSections'] = !$this->isMobileMode;
return $vars;
}
diff --git a/javascripts/modules/toc/toc.js b/javascripts/modules/toc/toc.js
index e741335..57452af 100644
--- a/javascripts/modules/toc/toc.js
+++ b/javascripts/modules/toc/toc.js
@@ -36,7 +36,16 @@
toc = new TableOfContents( {
sections: sections
} );
- toc.appendTo( M.getLeadSection() );
+ if ( !mw.config.get( 'wgNoToggleSections' ) ) {
+ toc.appendTo( M.getLeadSection() );
+ } else {
+ // don't show toc at end of page, when no
sections there
+ toc.insertAfter( '#toc' );
+ // remove the original parser toc
+ this.$( '#toc' ).remove();
+ // prevent to float text right of toc
+ this.$( '.toc-mobile' ).after( '<div
style="clear:both;"></div>' );
+ }
toggle.enable( toc.$el );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/143062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46d9a2eac632bb67b5a7f9c040b718abe2258b04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
