diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module index 20fd405..751fb51 100644 --- a/core/modules/shortcut/shortcut.module +++ b/core/modules/shortcut/shortcut.module @@ -728,6 +728,7 @@ function shortcut_toolbar() { 'tray' => array( '#pre_render' => array('shortcut_toolbar_pre_render'), ), + 'weight' => -10, ); return $items; } diff --git a/core/modules/toolbar/js/interactivemenu.js b/core/modules/toolbar/js/interactivemenu.js index 56575c4..e6ef4e4 100644 --- a/core/modules/toolbar/js/interactivemenu.js +++ b/core/modules/toolbar/js/interactivemenu.js @@ -27,7 +27,6 @@ var openItem = JSON.parse(localStorage.getItem('Drupal.interactivemenu.openItem' toggleList($item); // Close open siblings and their open children. var $openItems = $item.siblings().filter('.open'); - $openItems = $openItems.add($openItems.find('.open')); toggleList($openItems, false); // Save link of the closest open item through a unique selector. var href = $toggle.siblings('a[href]').attr('href'); diff --git a/core/modules/toolbar/js/toolbar.js b/core/modules/toolbar/js/toolbar.js index 8065e55..a871394 100644 --- a/core/modules/toolbar/js/toolbar.js +++ b/core/modules/toolbar/js/toolbar.js @@ -35,7 +35,7 @@ var $toolbar; * The Drupal toolbar allows modules to register top-level tabs. These may point * directly to a resource or toggle the visibility of a tray. * - * Modules register tabs with hook_toolbar_register_tabs. + * Modules register tabs with hook_toolbar. */ Drupal.behaviors.toolbar = { attach: function(context) { diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index c725353..b20f320 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -114,7 +114,7 @@ function toolbar_toolbar() { 'title' => t('Home page'), ), ), - 'weight' => -10, + 'weight' => -20, ); // Retrieve the administration menu from the database. @@ -142,7 +142,7 @@ function toolbar_toolbar() { ), ), 'tray' => $menu, - 'weight' => -5, + 'weight' => -15, ); return $items; diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 7e547f4..ed421ca 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -3117,6 +3117,7 @@ function user_toolbar() { 'tray' => array( '#pre_render' => array('user_toolbar_pre_render'), ), + 'weight' => -5, ); return $items;