Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402113 )
Change subject: Update: hide section expansion option on large displays ...................................................................... Update: hide section expansion option on large displays On large displays, don't show the "expand all sections" setting on Special:MobileOptions. This option is only considered for small displays. Bug: T183493 Change-Id: I8e2beb2a6d4466f563759561a2c3e225deeae620 --- M resources/mobile.special.mobileoptions.scripts/mobileoptions.js M resources/mobile.toggle/toggle.js 2 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/13/402113/1 diff --git a/resources/mobile.special.mobileoptions.scripts/mobileoptions.js b/resources/mobile.special.mobileoptions.scripts/mobileoptions.js index a4be225..944d7a1 100644 --- a/resources/mobile.special.mobileoptions.scripts/mobileoptions.js +++ b/resources/mobile.special.mobileoptions.scripts/mobileoptions.js @@ -1,5 +1,6 @@ ( function ( M, $ ) { var storage = mw.storage, + browser = M.require( 'mobile.startup/Browser' ).getSingleton(), toast = M.require( 'mobile.startup/toast' ), EXPAND_SECTIONS_KEY = 'expandSections', msg = mw.msg, @@ -161,7 +162,11 @@ }, 250 ); } ); - if ( mw.config.get( 'wgMFExpandAllSectionsUserOption' ) ) { + if ( mw.config.get( 'wgMFExpandAllSectionsUserOption' ) && + // Don't show this option on large screens since it's only honored for small screens. This + // logic should be kept in sync with Toggle._enable(). + !browser.isWideScreen() + ) { addExpandAllSectionsToForm( $form ); } diff --git a/resources/mobile.toggle/toggle.js b/resources/mobile.toggle/toggle.js index 621c52f..d325992 100644 --- a/resources/mobile.toggle/toggle.js +++ b/resources/mobile.toggle/toggle.js @@ -298,7 +298,9 @@ enableKeyboardActions( self, $heading ); if ( !isReferenceSection && ( !isClosed && browser.isWideScreen() || expandSections ) ) { - // Expand sections by default on wide screen devices or if the expand sections setting is set + // Expand sections by default on wide screen devices or if the expand sections setting is + // set. The wide screen logic for determining whether to collapse sections initially + // should be kept in sync with mobileoptions#initLocalStorageElements(). self.toggle( $heading ); } } -- To view, visit https://gerrit.wikimedia.org/r/402113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e2beb2a6d4466f563759561a2c3e225deeae620 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: specialpages Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: Sniedzielski <sniedziel...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits