From 7bb127d55f0b0441adb7ecd2b3d487cbd467f511 Mon Sep 17 00:00:00 2001
From: "lee.5151" <lee.5151@osu.edu>
Date: Mon, 28 Nov 2022 12:53:58 -0500
Subject: [PATCH] Upgrading drupal/admin_toolbar (3.2.1 => 3.3.0)
---
composer.json | 2 +-
composer.lock | 18 ++--
vendor/composer/installed.json | 18 ++--
vendor/composer/installed.php | 10 +--
.../admin_toolbar/{README.txt => README.md} | 35 +++-----
.../admin_toolbar/admin_toolbar.info.yml | 8 +-
...admin_toolbar_links_access_filter.info.yml | 10 +--
.../admin_toolbar_search.info.yml | 8 +-
.../admin_toolbar_search.libraries.yml | 2 +-
.../js/admin_toolbar_search.js | 3 +-
.../admin_toolbar_tools.info.yml | 8 +-
web/modules/admin_toolbar/composer.json | 3 -
.../admin_toolbar/css/admin.toolbar.css | 89 -------------------
13 files changed, 56 insertions(+), 158 deletions(-)
rename web/modules/admin_toolbar/{README.txt => README.md} (84%)
mode change 100755 => 100644
diff --git a/composer.json b/composer.json
index fdb70b8e51..a40e62df88 100644
--- a/composer.json
+++ b/composer.json
@@ -88,7 +88,7 @@
"desandro/masonry": "4.2",
"dimsemenov/magnific-popup": "1.1",
"drupal/addtocalendar": "3.2",
- "drupal/admin_toolbar": "3.2.1",
+ "drupal/admin_toolbar": "3.3",
"drupal/adminimal_theme": "^1.6",
"drupal/administerusersbyrole": "3.3",
"drupal/allowed_formats": "1.5",
diff --git a/composer.lock b/composer.lock
index 9f77354148..c38b50fc20 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "34725321c1b77f13acdd41e96c52fb5d",
+ "content-hash": "891fca6757bcda858cd474950720547c",
"packages": [
{
"name": "alchemy/zippy",
@@ -1746,20 +1746,20 @@
},
{
"name": "drupal/admin_toolbar",
- "version": "3.2.1",
+ "version": "3.3.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/admin_toolbar.git",
- "reference": "3.2.1"
+ "reference": "3.3.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.2.1.zip",
- "reference": "3.2.1",
- "shasum": "7a4bfb716e269be4ca03b7f04e29e4439ec6cf93"
+ "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.3.0.zip",
+ "reference": "3.3.0",
+ "shasum": "8e61fba9c9d83a94a844cff96d00871878a7eb98"
},
"require": {
- "drupal/core": "^8.8.0 || ^9.0"
+ "drupal/core": "^9.2 || ^10"
},
"require-dev": {
"drupal/admin_toolbar_tools": "*"
@@ -1767,8 +1767,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "3.2.1",
- "datestamp": "1665044276",
+ "version": "3.3.0",
+ "datestamp": "1669567837",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ffdd21e445..3419ab0433 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1790,21 +1790,21 @@
},
{
"name": "drupal/admin_toolbar",
- "version": "3.2.1",
- "version_normalized": "3.2.1.0",
+ "version": "3.3.0",
+ "version_normalized": "3.3.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/admin_toolbar.git",
- "reference": "3.2.1"
+ "reference": "3.3.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.2.1.zip",
- "reference": "3.2.1",
- "shasum": "7a4bfb716e269be4ca03b7f04e29e4439ec6cf93"
+ "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.3.0.zip",
+ "reference": "3.3.0",
+ "shasum": "8e61fba9c9d83a94a844cff96d00871878a7eb98"
},
"require": {
- "drupal/core": "^8.8.0 || ^9.0"
+ "drupal/core": "^9.2 || ^10"
},
"require-dev": {
"drupal/admin_toolbar_tools": "*"
@@ -1812,8 +1812,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "3.2.1",
- "datestamp": "1665044276",
+ "version": "3.3.0",
+ "datestamp": "1669567837",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index bddb3ca2ac..c59295b195 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'osu-asc-webservices/d8-upstream',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '429f72e15c8ceea994931b8d1abf14e67c0e8c20',
+ 'reference' => 'b32d6543d3f3958296e85fa3c3e6faf263f8a478',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -287,9 +287,9 @@
'dev_requirement' => false,
),
'drupal/admin_toolbar' => array(
- 'pretty_version' => '3.2.1',
- 'version' => '3.2.1.0',
- 'reference' => '3.2.1',
+ 'pretty_version' => '3.3.0',
+ 'version' => '3.3.0.0',
+ 'reference' => '3.3.0',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/admin_toolbar',
'aliases' => array(),
@@ -1594,7 +1594,7 @@
'osu-asc-webservices/d8-upstream' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '429f72e15c8ceea994931b8d1abf14e67c0e8c20',
+ 'reference' => 'b32d6543d3f3958296e85fa3c3e6faf263f8a478',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
diff --git a/web/modules/admin_toolbar/README.txt b/web/modules/admin_toolbar/README.md
old mode 100755
new mode 100644
similarity index 84%
rename from web/modules/admin_toolbar/README.txt
rename to web/modules/admin_toolbar/README.md
index 110c238e28..1e21627dfc
--- a/web/modules/admin_toolbar/README.txt
+++ b/web/modules/admin_toolbar/README.md
@@ -1,16 +1,14 @@
-CONTENTS OF THIS FILE
----------------------
+# CONTENTS OF THIS FILE
- * Introduction
- * Requirements
- * Recommended modules
- * Installation
- * Configuration
- * Maintainers
+ - Introduction
+ - Requirements
+ - Recommended modules
+ - Installation
+ - Configuration
+ - Maintainers
-INTRODUCTION
-------------
+## INTRODUCTION
Admin Toolbar intends to improve the default Drupal Toolbar to transform it into
a drop-down menu, providing a fast and full access to all administration links.
@@ -22,14 +20,11 @@ a drop-down menu, providing a fast and full access to all administration links.
https://www.drupal.org/project/issues/search/admin_toolbar
-REQUIREMENTS
-------------
+## REQUIREMENTS
No special requirements.
-
-RECOMMENDED MODULES
--------------------
+## RECOMMENDED MODULES
* Admin Toolbar Extra Tools (https://www.drupal.org/project/admin_toolbar):
Provides menu links to administration pages or actions (eg. Flushing caches)
@@ -40,21 +35,17 @@ RECOMMENDED MODULES
'Use the administration pages and help' permission see menu links they don't
have access permission for.
-INSTALLATION
-------------
+## INSTALLATION
* Install as you would normally install a contributed Drupal module.
See: https://www.drupal.org/node/895232 for further information.
-CONFIGURATION
--------------
+## CONFIGURATION
* Configure the admin toolbar tools at (/admin/config/user-interface/settings).
-
-MAINTAINERS
------------
+## MAINTAINERS
Current maintainers:
* Wilfrid Roze (eme) - https://www.drupal.org/u/eme
diff --git a/web/modules/admin_toolbar/admin_toolbar.info.yml b/web/modules/admin_toolbar/admin_toolbar.info.yml
index d163217d91..191e5e4339 100644
--- a/web/modules/admin_toolbar/admin_toolbar.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar.info.yml
@@ -2,11 +2,11 @@ name: Admin Toolbar
description: Provides an improved drop-down menu interface to the site Toolbar.
package: Administration
type: module
-core_version_requirement: ^8.8.0 || ^9
+core_version_requirement: ^9.2 || ^10
dependencies:
- drupal:toolbar
-# Information added by Drupal.org packaging script on 2022-10-06
-version: '3.2.1'
+# Information added by Drupal.org packaging script on 2022-11-27
+version: '3.3.0'
project: 'admin_toolbar'
-datestamp: 1665044278
+datestamp: 1669567839
diff --git a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
index 4f70a071ee..19295d56d8 100644
--- a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
@@ -1,14 +1,12 @@
name: Admin Toolbar Links Access Filter
description: Provides a workaround for the common problem that users with 'Use the administration pages and help' permission see menu links they don't have access permission for. Once the issue <a href='https://www.drupal.org/node/296693'>https://www.drupal.org/node/296693</a> be solved, this module will be deprecated.
package: Administration
-
type: module
-core_version_requirement: ^8.8.0 || ^9.0
-
+core_version_requirement: ^9.2 || ^10
dependencies:
- admin_toolbar:admin_toolbar
-# Information added by Drupal.org packaging script on 2022-10-06
-version: '3.2.1'
+# Information added by Drupal.org packaging script on 2022-11-27
+version: '3.3.0'
project: 'admin_toolbar'
-datestamp: 1665044278
+datestamp: 1669567839
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml
index 5693e3f440..97c0c102c3 100644
--- a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml
@@ -2,12 +2,12 @@ name: Admin Toolbar Search
description: Provides search of Admin Toolbar items.
package: Administration
type: module
-core_version_requirement: ^8.8.0 || ^9.0
+core_version_requirement: ^9.2 || ^10
configure: admin_toolbar_search.settings
dependencies:
- admin_toolbar:admin_toolbar_tools
-# Information added by Drupal.org packaging script on 2022-10-06
-version: '3.2.1'
+# Information added by Drupal.org packaging script on 2022-11-27
+version: '3.3.0'
project: 'admin_toolbar'
-datestamp: 1665044278
+datestamp: 1669567839
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.libraries.yml b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.libraries.yml
index 057e36c966..26bc598e49 100644
--- a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.libraries.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.libraries.yml
@@ -7,5 +7,5 @@ search:
dependencies:
- core/jquery
- core/drupal
- - core/jquery.once
+ - core/once
- core/drupal.autocomplete
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js b/web/modules/admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js
index 45ea06d426..2e0966410a 100755
--- a/web/modules/admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js
+++ b/web/modules/admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js
@@ -19,7 +19,8 @@
var $self = this;
- $('#toolbar-bar', context).once('admin-toolbar-search').each(function () {
+ const elements = once('admin-toolbar-search', '#toolbar-bar', context);
+ $(elements).each(function () {
$self.links = [];
var $searchTab = $(this).find('#admin-toolbar-search-tab')
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
index d9d8220346..1eb071f705 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
@@ -3,11 +3,11 @@ description: Adds menu links like Flush cache, Run cron, Run updates, and Logout
package: Administration
configure: admin_toolbar_tools.settings
type: module
-core_version_requirement: ^8.8.0 || ^9.0
+core_version_requirement: ^9.2 || ^10
dependencies:
- admin_toolbar:admin_toolbar
-# Information added by Drupal.org packaging script on 2022-10-06
-version: '3.2.1'
+# Information added by Drupal.org packaging script on 2022-11-27
+version: '3.3.0'
project: 'admin_toolbar'
-datestamp: 1665044278
+datestamp: 1669567839
diff --git a/web/modules/admin_toolbar/composer.json b/web/modules/admin_toolbar/composer.json
index 9edb5030a2..6710e0191a 100755
--- a/web/modules/admin_toolbar/composer.json
+++ b/web/modules/admin_toolbar/composer.json
@@ -34,8 +34,5 @@
"support": {
"issues": "https://www.drupal.org/project/issues/admin_toolbar",
"source": "https://git.drupalcode.org/project/admin_toolbar"
- },
- "require": {
- "drupal/core": "^8.8.0 || ^9.0"
}
}
diff --git a/web/modules/admin_toolbar/css/admin.toolbar.css b/web/modules/admin_toolbar/css/admin.toolbar.css
index 98550bfef2..a397cf2a7e 100755
--- a/web/modules/admin_toolbar/css/admin.toolbar.css
+++ b/web/modules/admin_toolbar/css/admin.toolbar.css
@@ -111,89 +111,12 @@
cursor: pointer;
}
-[dir="rtl"] .toolbar-tray-horizontal .menu-item:hover {
- background: #fff;
-}
-
-[dir="rtl"] .toolbar-tray-horizontal .menu-item a:focus {
- background: #abeae4;
-}
-
-[dir="rtl"] .toolbar-tray-horizontal .toolbar-menu:not(:first-child) li.menu-item--expanded > a:focus {
- background-position: center right;
- background-image: url(../misc/icons/0074bd/chevron-right.svg);
- background-repeat: no-repeat;
-}
-
-[dir="rtl"] .toolbar-tray-horizontal .menu-item--expanded .menu {
- background: #fff;
- width: auto;
- height: auto;
-}
-
-[dir="rtl"] .toolbar-tray-horizontal .menu-item--expanded {
- background-color: #f5f5f2;
-}
-
-[dir="rtl"] .toolbar-tray-horizontal ul li li.menu-item {
- border-top: none transparent;
- border-right: 1px solid #ddd;
- border-bottom: 1px solid #ddd;
- border-left: 1px solid #ddd;
-}
-
-[dir="rtl"] .toolbar .toolbar-tray-horizontal .menu-item:last-child {
- border-left: 1px solid #ddd;
- border-right: 1px solid #ddd;
-}
-
-[dir="rtl"] .toolbar .toolbar-tray-horizontal ul ul li.menu-item:first-child {
- border-top: 1px solid #ddd;
-}
-
-[dir="rtl"] .toolbar-tray-horizontal li.menu-item--expanded.hover-intent ul ul,
-[dir="rtl"] .toolbar-tray-horizontal li.menu-item--expanded.hover-intent ul ul ul,
-[dir="rtl"] .toolbar-tray-horizontal li.menu-item--expanded.hover-intent ul ul ul ul,
-[dir="rtl"] .toolbar-tray-horizontal li.menu-item--expanded.hover-intent ul ul ul ul ul {
- display: none;
- left: -999em; /* LTR */
-}
-
-/* Lists nested under hovered list items */
-[dir="rtl"] .toolbar-tray-horizontal li.menu-item--expanded.hover-intent ul,
-[dir="rtl"] .toolbar-tray-horizontal li li.menu-item--expanded.hover-intent ul,
-[dir="rtl"] .toolbar-tray-horizontal li li li.menu-item--expanded.hover-intent ul,
-[dir="rtl"] .toolbar-tray-horizontal li li li li.menu-item--expanded.hover-intent ul,
-[dir="rtl"] .toolbar-tray-horizontal li li li li li.menu-item--expanded.hover-intent ul {
- display: block;
- left: auto; /* LTR */
-}
-
-[dir="rtl"] .toolbar-tray-horizontal .menu ul li a,
-[dir="rtl"] .toolbar-tray-horizontal .menu ul .toolbar-icon {
- padding: 12px 15px 12px 12px;
-}
-
-[dir="rtl"] .toolbar-tray-horizontal ul li.menu-item--expanded.hover-intent ul {
- display: block;
- position: absolute;
- width: 200px;
- box-shadow: 2px 2px 3px hsla(0, 0%, 0%, 0.4);
- z-index: 1;
-}
-
-[dir="rtl"] .toolbar-tray-horizontal ul li.menu-item--expanded .menu-item > ul {
- display: none;
-}
-
[dir="rtl"] .toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded {
background-position: center left;
background-image: url(../misc/icons/0074bd/chevron-left.svg);
- background-repeat: no-repeat;
}
[dir="rtl"] .toolbar-tray-horizontal ul li.menu-item--expanded .menu-item.hover-intent ul {
- display: block;
margin: -40px 197px 0 0;
}
@@ -204,15 +127,3 @@
[dir="rtl"] .toolbar-tray-horizontal li.hover-intent ul li {
float: none;
}
-
-[dir="rtl"] .toolbar-tray-horizontal .toolbar .level-2 > ul {
- position: absolute;
- padding-top: 0;
- top: 0;
- left: 200px;
- width: 200px;
-}
-
-[dir="rtl"] .toolbar .toolbar-tray-vertical li.open > ul.toolbar-menu.clearfix {
- display: block;
-}
--
GitLab