Skip to content
Snippets Groups Projects
Commit 5f991379 authored by Michael Lee's avatar Michael Lee
Browse files

Upgrading drupal/bootstrap (3.29.0 => 3.30.0)

parent d640efba
No related branches found
No related tags found
1 merge request!81Module Updates
Hide whitespace changes
Inline Side-by-side
Showing
with 36 additions and 39 deletions
composer.lock
+ 8
− 8
View file @ 5f991379
......@@ -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": "a9dd2867aad93dcbeed1ebbf9a3abfb9",
"content-hash": "ab5ebea528ebba171d187f4eecf44a03",
"packages": [
{
"name": "asm89/stack-cors",
......@@ -1884,17 +1884,17 @@
},
{
"name": "drupal/bootstrap",
"version": "3.29.0",
"version": "3.30.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/bootstrap.git",
"reference": "8.x-3.29"
"reference": "8.x-3.30"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/bootstrap-8.x-3.29.zip",
"reference": "8.x-3.29",
"shasum": "85ab09921602cb184f1d18b79d7d864b6eb06c8c"
"url": "https://ftp.drupal.org/files/projects/bootstrap-8.x-3.30.zip",
"reference": "8.x-3.30",
"shasum": "37a44a677163d2e82f1a8b55bd5feddb88918ad2"
},
"require": {
"drupal/core": "^9.5 || ^10",
......@@ -1903,8 +1903,8 @@
"type": "drupal-theme",
"extra": {
"drupal": {
"version": "8.x-3.29",
"datestamp": "1689102544",
"version": "8.x-3.30",
"datestamp": "1707842525",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
......
vendor/composer/installed.json
+ 8
− 8
View file @ 5f991379
......@@ -1976,18 +1976,18 @@
},
{
"name": "drupal/bootstrap",
"version": "3.29.0",
"version_normalized": "3.29.0.0",
"version": "3.30.0",
"version_normalized": "3.30.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/bootstrap.git",
"reference": "8.x-3.29"
"reference": "8.x-3.30"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/bootstrap-8.x-3.29.zip",
"reference": "8.x-3.29",
"shasum": "85ab09921602cb184f1d18b79d7d864b6eb06c8c"
"url": "https://ftp.drupal.org/files/projects/bootstrap-8.x-3.30.zip",
"reference": "8.x-3.30",
"shasum": "37a44a677163d2e82f1a8b55bd5feddb88918ad2"
},
"require": {
"drupal/core": "^9.5 || ^10",
......@@ -1996,8 +1996,8 @@
"type": "drupal-theme",
"extra": {
"drupal": {
"version": "8.x-3.29",
"datestamp": "1689102544",
"version": "8.x-3.30",
"datestamp": "1707842525",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
......
vendor/composer/installed.php
+ 5
− 5
View file @ 5f991379
......@@ -3,7 +3,7 @@
'name' => 'osu-asc-webservices/d8-upstream',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'reference' => '27fe83da2807ef85b5fde27ff0417a1a144ff666',
'reference' => 'd640efba666114e000b62837b41eadfdbf8a6686',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
......@@ -308,9 +308,9 @@
'dev_requirement' => false,
),
'drupal/bootstrap' => array(
'pretty_version' => '3.29.0',
'version' => '3.29.0.0',
'reference' => '8.x-3.29',
'pretty_version' => '3.30.0',
'version' => '3.30.0.0',
'reference' => '8.x-3.30',
'type' => 'drupal-theme',
'install_path' => __DIR__ . '/../../web/themes/bootstrap',
'aliases' => array(),
......@@ -1411,7 +1411,7 @@
'osu-asc-webservices/d8-upstream' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'reference' => '27fe83da2807ef85b5fde27ff0417a1a144ff666',
'reference' => 'd640efba666114e000b62837b41eadfdbf8a6686',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
......
web/themes/bootstrap/bootstrap.info.yml
+ 3
− 3
View file @ 5f991379
......@@ -78,7 +78,7 @@ libraries-override:
theme:
css/node.preview.css: false
# Information added by Drupal.org packaging script on 2023-07-11
version: '8.x-3.29'
# Information added by Drupal.org packaging script on 2024-02-13
version: '8.x-3.30'
project: 'bootstrap'
datestamp: 1689102547
datestamp: 1707842528
web/themes/bootstrap/js/misc/ajax.js
+ 1
− 10
View file @ 5f991379
......@@ -100,7 +100,7 @@
}
// If element is an input DOM element type (not :input), append after.
if ($element.is('input')) {
if ($element.is('input') || $element.is('select')) {
$element.after(this.progress.element);
}
// Otherwise append the throbber inside the element.
......@@ -120,15 +120,6 @@
Drupal.Ajax.prototype.success = function (response, status) {
if (this.progress.element) {
// Stop a glyphicon throbber.
if (this.progress.glyphicon) {
this.glyphiconStop(this.progress.element);
}
// Remove the progress element.
else {
this.progress.element.remove();
}
// Remove any message set.
this.progress.element.parent().find('.message').remove();
}
......
web/themes/bootstrap/src/Plugin/Alter/LibraryInfo.php
+ 3
− 0
View file @ 5f991379
......@@ -59,6 +59,9 @@ public function alter(&$libraries, &$extension = NULL, &$context2 = NULL) {
// Remove core's dialog.jquery-ui.js.
unset($libraries['drupal.dialog']['js']['misc/dialog/dialog.jquery-ui.js']);
// Remove CKEditor dialog fix as it assumes jquery ui dialogs are used
unset($libraries['drupal.dialog']['js']['modules/ckeditor5/js/ckeditor5.dialog.fix.js']);
// Add the Modal jQuery UI Bridge.
$libraries['drupal.dialog']['dependencies'][] = 'bootstrap/dialog';
$libraries['drupal.dialog']['dependencies'][] = 'bootstrap/modal.jquery.ui.bridge';
......
web/themes/bootstrap/src/Plugin/Preprocess/FieldMultipleValueForm.php
+ 5
− 1
View file @ 5f991379
......@@ -28,9 +28,13 @@ public function preprocessElement(Element $element, Variables $variables) {
foreach ($variables['table']['#header'] as &$header_row) {
if (is_array($header_row) && isset($header_row['data'])) {
$header_row['data'] = is_array($header_row['data']) ? ($prefixes + $header_row['data']) : ($prefixes + ['#markup' => $header_row['data']]);
} else {
}
elseif (is_string($header_row)) {
$header_row = ['data' => $prefixes + ['#markup' => $header_row]];
}
else {
$header_row = ['data' => $prefixes];
}
}
}
}
......
web/themes/bootstrap/src/Plugin/Preprocess/Menu.php
+ 1
− 1
View file @ 5f991379
......@@ -33,7 +33,7 @@ protected function convertAttributes(array &$items) {
foreach ($items as &$item) {
$wrapperAttributes = new Attributes();
$linkAttributes = new Attributes();
if ($item['attributes'] instanceof Attribute || $item['attributes'] instanceof Attributes) {
if (isset($item['attributes']) && ($item['attributes'] instanceof Attribute || $item['attributes'] instanceof Attributes)) {
$wrapperAttributes->setAttributes($item['attributes']->getIterator()->getArrayCopy());
}
if ($item['url'] instanceof Url) {
......
web/themes/bootstrap/src/Plugin/Provider/ProviderBase.php
+ 1
− 2
View file @ 5f991379
......@@ -649,8 +649,7 @@ public function processDefinition(array &$definition, $plugin_id) {
$fileSystem->prepareDirectory($provider_path, $options);
}
else {
// @noRector
file_prepare_directory($provider_path, $options);
\Drupal::service('file_system')->prepareDirectory($provider_path, $options);
}
// Use manually imported API data, if it exists.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment