jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376554 )
Change subject: Hygiene: Do not pass mainMenu to Skin
......................................................................
Hygiene: Do not pass mainMenu to Skin
This wires the interaction between the skin and the main menu
into the initialisation script.
Change-Id: I4fac234cb9ead7e99dc52f72819cd4a3c715de1c
Depends-On: Ife64c87716a0f56b55a030a3e4224075af3c6d8c
---
M resources/skins.minerva.scripts/preInit.js
1 file changed, 21 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/resources/skins.minerva.scripts/preInit.js
b/resources/skins.minerva.scripts/preInit.js
index 9b3056e..2f4491b 100644
--- a/resources/skins.minerva.scripts/preInit.js
+++ b/resources/skins.minerva.scripts/preInit.js
@@ -20,13 +20,32 @@
el: 'body',
tabletModules: [ 'skins.minerva.tablet.scripts' ],
page: getCurrentPage(),
- referencesGateway:
ReferencesMobileViewGateway.getSingleton(),
- mainMenu: mainMenu
+ referencesGateway:
ReferencesMobileViewGateway.getSingleton()
};
skin = new Skin( skinData );
M.define( 'skins.minerva.scripts/skin', skin );
+ /**
+ * Close navigation if skin is tapped
+ * @param {jQuery.Event} ev
+ * @private
+ */
+ function onSkinClick( ev ) {
+ var $target = this.$( ev.target );
+
+ // Make sure the menu is open and we are not clicking on the
menu button
+ if (
+ mainMenu &&
+ mainMenu.isOpen() &&
+ !$target.hasClass( 'main-menu-button' )
+ ) {
+ mainMenu.closeNavigationDrawers();
+ ev.preventDefault();
+ }
+ }
+ skin.on( 'click', onSkinClick.bind( skin ) );
+
( function ( wgRedirectedFrom ) {
// If the user has been redirected, then show them a toast
message (see
// https://phabricator.wikimedia.org/T146596).
--
To view, visit https://gerrit.wikimedia.org/r/376554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4fac234cb9ead7e99dc52f72819cd4a3c715de1c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Pmiazga <pmia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
