From 8758f87c4b8a165b4a060f354d6a01ed0f692a32 Mon Sep 17 00:00:00 2001 From: bwang Date: Mon, 4 Oct 2021 12:54:22 -0500 Subject: [PATCH] Replace getVectorMenu function with jQuery equivalent Bug: T292319 Change-Id: I9c9a179b3bcce9eccdf7037818823568f77f2b35 --- resources/skins.vector.js/dropdownMenus.js | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/resources/skins.vector.js/dropdownMenus.js b/resources/skins.vector.js/dropdownMenus.js index b8974acf..e06745c8 100644 --- a/resources/skins.vector.js/dropdownMenus.js +++ b/resources/skins.vector.js/dropdownMenus.js @@ -12,18 +12,6 @@ function closeDropdownsOnClickOutside() { } ); } -/** - * @param {HTMLElement} item - * @return {HTMLElement|null} - */ -function getVectorMenu( item ) { - if ( item.classList.contains( 'vector-menu' ) ) { - return item; - } else { - var parent = /** @type {HTMLElement} */( item.parentNode ); - return parent ? getVectorMenu( parent ) : null; - } -} /** * Adds icon placeholder for gadgets to use. * @@ -36,11 +24,12 @@ function getVectorMenu( item ) { */ function addPortletLinkHandler( item, data ) { var link = item.querySelector( 'a' ); - var menu = getVectorMenu( item ); + var $menu = $( item ).parents( '.vector-menu' ); + var menuElement = $menu.length && $menu.get( 0 ) || null; // Dropdowns which have not got the noicon class are icon capable. - var isIconCapable = menu && menu.classList.contains( + var isIconCapable = menuElement && menuElement.classList.contains( 'vector-menu-dropdown' - ) && !menu.classList.contains( + ) && !menuElement.classList.contains( 'vector-menu-dropdown-noicon' );