Skip to content

[6.1] Fix default menu layout - submenu stay open on page load #46397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: 6.1-dev
Choose a base branch
from
+732 −687
Open

[6.1] Fix default menu layout - submenu stay open on page load #46397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1f51713
[6.0] Translation Update (#46382)
joomla-translation-bot Oct 30, 2025
c5acc74
[6.0] README.md delete heavy development note (#46222)
muhme Oct 31, 2025
7bcf4a3
[6.0] Change major version to 7.0 for deprecation removals (#46367)
laoneo Oct 31, 2025
815d208
Toggle all dropdowns for active menu-item in submenu on load
LadySolveig Nov 2, 2025
5277751
Ensure aria-expanded attribute is safely set
LadySolveig Nov 2, 2025
f231e7a
Prevent submenu open on load for active menuitem only with class `nav…
LadySolveig Nov 2, 2025
98c49ca
Merge branch '6.1-dev' into 6.0/fix/default-menu-submenu-current-toggle
tecpromotion Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/components/com_banners/helpers/banners.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 1.6
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Banners\Administrator\Helper\BannersHelper instead
*/
class BannersHelper extends \Joomla\Component\Banners\Administrator\Helper\BannersHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_categories/helpers/categories.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 1.6
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Categories\Administrator\Helper\CategoriesHelper instead
*/
class CategoriesHelper extends \Joomla\Component\Categories\Administrator\Helper\CategoriesHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_contact/helpers/contact.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 1.6
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Contact\Administrator\Helper\ContactHelper instead
*/
class ContactHelper extends \Joomla\Component\Contact\Administrator\Helper\ContactHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/helpers/content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 1.6
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Content\Administrator\Helper\ContentHelper instead
*/
class ContentHelper extends \Joomla\Component\Content\Administrator\Helper\ContentHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_contenthistory/helpers/contenthistory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 3.2
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Contenthistory\Administrator\Helper\ContenthistoryHelper instead
*/
class ContenthistoryHelper extends \Joomla\Component\Contenthistory\Administrator\Helper\ContenthistoryHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_fields/helpers/fields.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 3.7.0
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Fields\Administrator\Helper\FieldsHelper instead
*/
class FieldsHelper extends \Joomla\Component\Fields\Administrator\Helper\FieldsHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_finder/helpers/language.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*
* @since 2.5
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Finder\Administrator\Helper\LanguageHelper instead
*/
class FinderHelperLanguage extends LanguageHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_installer/helpers/installer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 1.6
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Installer\Administrator\Helper\InstallerHelper instead
*/
class InstallerHelper extends \Joomla\Component\Installer\Administrator\Helper\InstallerHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ protected function downloadPackage($url, $target)
* @return boolean
* @since 2.5.1
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use "createUpdateFile" instead
* Example: $updateModel->createUpdateFile($basename);
*/
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_menus/helpers/menus.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 1.6
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Menus\Administrator\Helper\MenusHelper instead
*/
class MenusHelper extends \Joomla\Component\Menus\Administrator\Helper\MenusHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_modules/helpers/modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 1.6
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Modules\Administrator\Helper\ModulesHelper instead
*/
abstract class ModulesHelper extends \Joomla\Component\Modules\Administrator\Helper\ModulesHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_modules/src/Service/HTML/Modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public function batchOptions()
*
* @since 2.5
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Will be removed with no replacement
*/
public function positionList($clientId = 0)
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_newsfeeds/helpers/newsfeeds.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 1.6
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Newsfeeds\Administrator\Helper\NewsfeedsHelper instead
*/
class NewsfeedsHelper extends \Joomla\Component\Newsfeeds\Administrator\Helper\NewsfeedsHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_plugins/helpers/plugins.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 1.6
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Plugins\Administrator\Helper\PluginsHelper instead
*/
class PluginsHelper extends \Joomla\Component\Plugins\Administrator\Helper\PluginsHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_privacy/src/Plugin/PrivacyPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ abstract class PrivacyPlugin extends CMSPlugin
*
* @var \Joomla\Database\DatabaseDriver
* @since 3.9.0
* @deprecated 4.4.0 will be removed in 6.0 use $this->getDatabase() instead
* @deprecated 4.4.0 will be removed in 7.0 use $this->getDatabase() instead
*/
protected $db;

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_redirect/helpers/redirect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* Redirect component helper.
*
* @since 1.6
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Redirect\Administrator\Helper\RedirectHelp instead
*/
class RedirectHelper extends \Joomla\Component\Redirect\Administrator\Helper\RedirectHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_templates/helpers/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 3.2
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Templates\Administrator\Helper\TemplateHelper instead
*/
abstract class TemplateHelper extends \Joomla\Component\Templates\Administrator\Helper\TemplateHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_templates/helpers/templates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 1.6
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Templates\Administrator\Helper\TemplatesHelper instead
*/
class TemplatesHelper extends \Joomla\Component\Templates\Administrator\Helper\TemplatesHelper
Expand Down
8 changes: 4 additions & 4 deletions administrator/components/com_templates/src/Service/HTML/Templates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ class Templates
* Display the thumb for the template.
*
* @param string|object $template The name of the template or the template object.
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* The argument $template must be an object only
* @param integer $clientId No longer used, will be removed without replacement
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
*
* @return string The html string
*
Expand Down Expand Up @@ -89,10 +89,10 @@ public function thumb($template, $clientId = 0)
* Renders the html for the modal linked to thumb.
*
* @param string|object $template The name of the template or the template object.
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* The argument $template must be an object only
* @param integer $clientId No longer used, will be removed without replacement
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
*
* @return string The html string
*
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_users/helpers/debug.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*
* @since 1.6
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Users\Administrator\Helper\DebugHelper instead
*/
class UsersHelperDebug extends DebugHelper
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_users/helpers/users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
* @since 1.6
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Users\Administrator\Helper\UsersHelper instead
*/
class UsersHelper extends \Joomla\Component\Users\Administrator\Helper\UsersHelper
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_users/src/Helper/UsersHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public static function getRangeOptions()
* @since 3.2.0
* @throws \Exception
*
* @deprecated 4.2 will be removed in 6.0
* @deprecated 4.2 will be removed in 7.0
* No longer used, will be removed without replacement
*/
public static function getTwoFactorMethods()
Expand Down Expand Up @@ -174,7 +174,7 @@ public static function getVisibleByGroups($rules)
* @since 3.7.0
* @throws \Exception
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Users\Administrator\Extension\UsersComponent::validateSection() instead.
*/
public static function validateSection($section)
Expand All @@ -189,7 +189,7 @@ public static function validateSection($section)
*
* @since 3.7.0
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Users\Administrator\Extension\UsersComponent::getContexts() instead.
*/
public static function getContexts()
Expand Down
14 changes: 7 additions & 7 deletions administrator/components/com_users/src/Model/UserModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ public function getAssignedGroups($userId = null)
*
* @since 3.2
*
* @deprecated 4.2 will be removed in 6.0.
* @deprecated 4.2 will be removed in 7.0.
* Will be removed without replacement
*/
public function getOtpConfig($userId = null)
Expand Down Expand Up @@ -999,7 +999,7 @@ public function getOtpConfig($userId = null)
*
* @since 3.2
*
* @deprecated 4.2 will be removed in 5.0.
* @deprecated 4.2 will be removed in 7.0.
* Will be removed without replacement
*/
public function setOtpConfig($userId, $otpConfig)
Expand All @@ -1022,7 +1022,7 @@ public function setOtpConfig($userId, $otpConfig)
*
* @since 3.2
*
* @deprecated 4.2 will be removed in 6.0.
* @deprecated 4.2 will be removed in 7.0.
* Use \Joomla\CMS\Factory::getApplication()->get('secret') instead'
*/
public function getOtpConfigEncryptionKey()
Expand All @@ -1048,7 +1048,7 @@ public function getOtpConfigEncryptionKey()
* @since 3.2
* @throws \Exception
*
* @deprecated 4.2 will be removed in 5.0.
* @deprecated 4.2 will be removed in 7.0.
* Will be removed without replacement
*/
public function getTwofactorform($userId = null)
Expand All @@ -1074,7 +1074,7 @@ public function getTwofactorform($userId = null)
*
* @since 3.2
*
* @deprecated 4.2 will be removed in 5.0
* @deprecated 4.2 will be removed in 7.0
* Will be removed without replacement
*/
public function generateOteps($userId, $count = 10)
Expand Down Expand Up @@ -1102,7 +1102,7 @@ public function generateOteps($userId, $count = 10)
* @since 3.2
* @throws \Exception
*
* @deprecated 4.2 will be removed in 5.0
* @deprecated 4.2 will be removed in 7.0
* Will be removed without replacement
*/
public function isValidSecretKey($userId, $secretKey, $options = [])
Expand All @@ -1129,7 +1129,7 @@ public function isValidSecretKey($userId, $secretKey, $options = [])
*
* @since 3.2
*
* @deprecated 4.2 will be removed in 5.0
* @deprecated 4.2 will be removed in 7.0
* Will be removed without replacement
*/
public function isValidOtep($userId, $otep, $otpConfig = null)
Expand Down
2 changes: 1 addition & 1 deletion build/media_source/legacy/js/toolbar.es5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Joomla = window.Joomla || {};
*
* @since 4.0.0
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Will be removed without replacement. Use browser native call instead
*/
Joomla.popupWindow = function (mypage, myname, w, h, scroll) {
Expand Down
25 changes: 23 additions & 2 deletions build/media_source/mod_menu/js/menu.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
// Default settings for the Nav class
static defaultSettings = {
menuHoverClass: 'show-menu',
dir: 'ltr'
dir: 'ltr',
preventSubmenoOpenOnload: 'nav-active-open'
};

constructor(nav, settings = {}) {
Expand Down Expand Up @@ -79,6 +80,10 @@

nav.addEventListener('keydown', this.onMenuKeyDown.bind(this));
nav.addEventListener('click', this.onClick.bind(this));

if (this.nav.classList.contains(this.settings.preventSubmenoOpenOnload)) {
this.toggleAllForCurrentActive();
}
}

onMenuKeyDown(event) {
Expand Down Expand Up @@ -203,7 +208,7 @@
ulChild.setAttribute('aria-hidden', open ? 'false' : 'true');
ulChild.classList.toggle(this.settings.menuHoverClass, open);
});
target.querySelector(':scope > [aria-expanded]').setAttribute('aria-expanded', open ? 'true' : 'false');
target.querySelector(':scope > [aria-expanded]')?.setAttribute('aria-expanded', open ? 'true' : 'false');
}

focusTabbable(direction = 1) {
Expand Down Expand Up @@ -232,6 +237,22 @@
}
return currentLi; // top-level li or null if not found, or the
}

toggleAllForCurrentActive() {
const active = this.nav.querySelector('.current.active');
if (active) {
const $parentTopLevel = this.getTopLevelParentLi(active);
let currentLi = active;
while (currentLi && !Array.from(this.topLevelNodes).includes(currentLi)) {
const parentUl = currentLi.parentElement.closest('ul');
currentLi = parentUl ? parentUl.closest('li') : null;
if (currentLi) {
const subLists = currentLi.querySelectorAll('ul');
this.toggleSubMenu(currentLi, subLists, subLists[0]?.getAttribute('aria-hidden') === 'true');
}
}
}
}
}

// static idCounter for unique id generation of submenus
Expand Down
2 changes: 1 addition & 1 deletion build/media_source/system/js/core.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ Joomla.Text = {
*
* @type {{}}
*
* @deprecated 4.0 will be removed in 6.0
* @deprecated 4.0 will be removed in 7.0
* Example: Joomla.Text._('...');
* Joomla.Text.load(...);
*/
Expand Down
4 changes: 2 additions & 2 deletions build/media_source/system/js/fields/calendar.es5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,14 +1161,14 @@

/** B/C related code
*
* @deprecated 4.0 will be removed in 6.0
* @deprecated 4.0 will be removed in 7.0
* Use JoomlaCalendar.init instead
*/
window.Calendar = {};

/** B/C related code
*
* @deprecated 4.0 will be removed in 6.0
* @deprecated 4.0 will be removed in 7.0
* Use JoomlaCalendar.init instead
*/
Calendar.setup = function(obj) {
Expand Down
2 changes: 1 addition & 1 deletion components/com_contact/helpers/route.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* @subpackage com_contact
* @since 1.5
*
* @deprecated 4.3 will be removed in 6.0
* @deprecated 4.3 will be removed in 7.0
* Use \Joomla\Component\Contact\Site\Helper\RouteHelper instead
* Example: RouteHelper::method();
*/
Expand Down
Loading