summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--admin_menu.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 427a47c..7a66e90 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -48,6 +48,7 @@ by sun: Fixed sess_count() changed to drupal_session_count().
Admin Menu 6.x-3.x, xxxx-xx-xx
------------------------------
+#645526 by TravisCarden: Fixed stale local tasks markup after moving them.
#366442 by sun: Added tweak to collapse modules on permissions page.
#655926 by donquixote, sun: Improved performance of delayed mouseout.
#557062 by sun: Fixed admin_menu_toolbar JS/CSS loaded before admin_menu's.
diff --git a/admin_menu.js b/admin_menu.js
index 526d632..caf0dbe 100644
--- a/admin_menu.js
+++ b/admin_menu.js
@@ -161,7 +161,7 @@ Drupal.admin.behaviors.positionFixed = function (context, settings, $adminMenu)
Drupal.admin.behaviors.pageTabs = function (context, settings, $adminMenu) {
if (settings.admin_menu.tweak_tabs) {
$('ul.tabs.primary li', context).addClass('admin-menu-tab').appendTo('#admin-menu-wrapper > ul');
- $('ul.tabs.secondary', context).appendTo('#admin-menu-wrapper > ul > li.admin-menu-tab.active');
+ $('ul.tabs.secondary', context).appendTo('#admin-menu-wrapper > ul > li.admin-menu-tab.active').removeClass('secondary');
$('ul.tabs.primary', context).remove();
}
};