Bmansurov has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/313874

Change subject: Beta: disable section toggling
......................................................................

Beta: disable section toggling

This functionality is not needed as we have a floating Table of
Contents now.

Change-Id: I791e12737e6d89e7232860134c0534a24778e19f
---
M extension.json
M resources/skins.minerva.base.styles/ui.less
M resources/skins.minerva.toggling/init.js
3 files changed, 19 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/74/313874/1

diff --git a/extension.json b/extension.json
index 5011378..08d6884 100644
--- a/extension.json
+++ b/extension.json
@@ -1754,6 +1754,7 @@
                "skins.minerva.toggling": {
                        "class": "MFResourceLoaderParsedMessageModule",
                        "dependencies": [
+                               "mobile.context",
                                "mobile.toggle",
                                "skins.minerva.scripts"
                        ],
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index d93e7cb..5c8bfb0 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -228,10 +228,12 @@
 
        .edit-page {
                display: inline-block;
-               visibility: hidden;
+               .stable & {
+                       visibility: hidden;
+               }
        }
 
-       .open-block {
+       .stable .open-block {
                // Restrict to child so that child section edit links do not 
get revealed.
                .edit-page {
                        visibility: visible;
@@ -269,6 +271,14 @@
        }
 }
 
+// FIXME: ideally, make MobileFormatter not output this element as in beta
+// floating ToC was introduced in favor of toggling
+.beta {
+       .section-heading .indicator {
+               display: none;
+       }
+}
+
 .stable {
        // FIXME: Exists only for caching reasons (T139794)
        #page-secondary-actions #language-switcher,
diff --git a/resources/skins.minerva.toggling/init.js 
b/resources/skins.minerva.toggling/init.js
index 834caeb..c1c9ef9 100644
--- a/resources/skins.minerva.toggling/init.js
+++ b/resources/skins.minerva.toggling/init.js
@@ -1,5 +1,6 @@
 ( function ( M, $ ) {
        var page = M.getCurrentPage(),
+               context = M.require( 'mobile.context/context' ),
                $contentContainer = $( '#mw-content-text' ),
                Toggler = M.require( 'mobile.toggle/Toggler' );
 
@@ -22,7 +23,11 @@
        if (
                !page.inNamespace( 'special' ) &&
                !mw.config.get( 'wgIsMainPage' ) &&
-               mw.config.get( 'wgAction' ) === 'view'
+               mw.config.get( 'wgAction' ) === 'view' &&
+               // FIXME: ideally we should not load this module in beta, but
+               // currently it's not possible as we don't have a good mechanism
+               // to load modules in stable only without major refactoring.
+               !context.isBetaGroupMember()
        ) {
                init( $contentContainer, 'content-', page );
        }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I791e12737e6d89e7232860134c0534a24778e19f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to