Skip to content
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

Bootstrap 5.3.3 #15374

Merged
merged 8 commits into from
Feb 21, 2024
Merged

Bootstrap 5.3.3 #15374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
47d20af
Bootstrap 5.3.3
agriffard Feb 20, 2024
b2c030a
Fix the theme selector script
MikeAlhayek Feb 21, 2024
03b25b0
Merge remote-tracking branch 'origin/main' into ag/bootstrap5.3.3
sebastienros Feb 21, 2024
98f371b
Update cors-admin.js
sebastienros Feb 21, 2024
e3f95eb
Update cors-admin.js
sebastienros Feb 21, 2024
00be7f4
Update cors-admin.js
sebastienros Feb 21, 2024
7a63847
Update cors-admin.js
sebastienros Feb 21, 2024
211392c
Remove EOL
sebastienros Feb 21, 2024
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
14 changes: 7 additions & 7 deletions src/OrchardCore.Modules/OrchardCore.AdminDashboard/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.AdminDashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"name": "orchardcore.admindashboard",
"version": "1.0.0",
"dependencies": {
"bootstrap": "5.3.2"
"bootstrap": "5.3.3"
}
}
14 changes: 7 additions & 7 deletions src/OrchardCore.Modules/OrchardCore.AdminMenu/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.AdminMenu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "orchardcore.adminmenu",
"version": "1.0.0",
"dependencies": {
"bootstrap": "5.3.2",
"bootstrap": "5.3.3",
"fontawesome-iconpicker": "3.2.0"
}
}
14 changes: 7 additions & 7 deletions src/OrchardCore.Modules/OrchardCore.AuditTrail/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.AuditTrail/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "MIT",
"description": "A diff module for OrchardCore.",
"dependencies": {
"bootstrap": "5.3.2",
"bootstrap": "5.3.3",
"diff": "5.1.0",
"react": "^16.14.0",
"react-diff-viewer": "^3.1.1",
Expand Down
8 changes: 4 additions & 4 deletions src/OrchardCore.Modules/OrchardCore.ContentFields/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.ContentFields/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"name": "orchardcore.contentfields",
"version": "1.0.0",
"dependencies": {
"bootstrap": "5.3.2"
"bootstrap": "5.3.3"
}
}
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Deployment/wwwroot/Scripts/steporder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function updateStepOrders(oldIndex, newIndex) {
}
$(function () {
var sortable = document.getElementById("stepOrder");
if (!sortable) {
if (sortable) {
return;
}
var sortable = Sortable.create(sortable, {
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Deployment/wwwroot/Scripts/steporder.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions src/OrchardCore.Modules/OrchardCore.Markdown/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Markdown/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "orchardcore.markdown",
"version": "1.0.0",
"dependencies": {
"bootstrap": "5.3.2",
"bootstrap": "5.3.3",
"easymde": "2.18.0"
}
}
14 changes: 7 additions & 7 deletions src/OrchardCore.Modules/OrchardCore.Media/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Media/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"dependencies": {
"blueimp-file-upload": "10.32.0",
"bootstrap": "5.3.2"
"bootstrap": "5.3.3"
}
}
22 changes: 11 additions & 11 deletions src/OrchardCore.Modules/OrchardCore.Resources/ResourceManagementOptionsConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,31 +179,31 @@ ResourceManifest BuildManifest()
.DefineScript("bootstrap")
.SetDependencies("popperjs")
.SetUrl("~/OrchardCore.Resources/Scripts/bootstrap.min.js", "~/OrchardCore.Resources/Scripts/bootstrap.js")
.SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.js")
.SetCdnIntegrity("sha384-BBtl+eGJRgqQAUMxJ7pMwbEyER4l1g+O15P+16Ep7Q9Q+zqX6gSbd85u4mG4QzX+", "sha384-0OXpCFnSQ8aVy03XgJ/CRB6pSELypcPWNcgqPnyguU/ADjPf/kx/dG4WfXjjU64D")
.SetVersion("5.3.2");
.SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.js")
.SetCdnIntegrity("sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy", "sha384-jYoAmFjufJZfBzwTARyz2gk7Jj9mQb2cLeP9n5PcgLCVVd+8QfjY1+qFj+rBkViV")
.SetVersion("5.3.3");

manifest
.DefineScript("bootstrap-bundle")
.SetDependencies("jQuery")
.SetUrl("~/OrchardCore.Resources/Scripts/bootstrap.bundle.min.js", "~/OrchardCore.Resources/Scripts/bootstrap.bundle.js")
.SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.js")
.SetCdnIntegrity("sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL", "sha384-6yr0NH5/NO/eJn8MXILS94sAfqCcf2wpWTTxRwskNor6dIjwbYjw1/PZpr654rQ5")
.SetVersion("5.3.2");
.SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.js")
.SetCdnIntegrity("sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz", "sha384-5xO2n1cyGKAe630nacBqFQxWoXjUIkhoc/FxQrWM07EIZ3TuqkAsusDeyPDOIeid")
.SetVersion("5.3.3");

manifest
.DefineStyle("bootstrap")
.SetUrl("~/OrchardCore.Resources/Styles/bootstrap.min.css", "~/OrchardCore.Resources/Styles/bootstrap.css")
.SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.css")
.SetCdnIntegrity("sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN", "sha384-8dbpXuP2nso7zrhApj0aSxeb0ZitbTeO0hTKxRcXavYE0vv4nhBEqvv+o+0X94A8")
.SetVersion("5.3.2");
.SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.css")
.SetCdnIntegrity("sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH", "sha384-qAlWxD5RDF+aEdUc1Z7GR/tE4zYjX1Igo/LrIexlnzM6G63a6F1fXZWpZKSrSW86")
.SetVersion("5.3.3");

manifest
.DefineStyle("bootstrap-rtl")
.SetUrl("~/OrchardCore.Resources/Styles/bootstrap.rtl.min.css", "~/OrchardCore.Resources/Styles/bootstrap.rtl.css")
.SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.rtl.min.css", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.rtl.css")
.SetCdn("https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.rtl.min.css", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.rtl.css")
.SetCdnIntegrity("sha384-nU14brUcp6StFntEOOEBvcJm4huWjB0OcIeQ3fltAfSmuZFrkAif0T+UtNGlKKQv", "sha384-CEku08bnqQAT/vzi6/zxMQmSyxoOTK1jx7mbT8P7etf/YhPbxASCX5BIVuAK9sfy")
.SetVersion("5.3.2");
.SetVersion("5.3.3");

manifest
.DefineStyle("bootstrap-select")
Expand Down
14 changes: 7 additions & 7 deletions src/OrchardCore.Modules/OrchardCore.Resources/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"dependencies": {
"@fortawesome/fontawesome-free": "6.5.1",
"@popperjs/core": "2.11.8",
"bootstrap": "5.3.2",
"bootstrap": "5.3.3",
"bootstrap-select": "1.14.0-beta3",
"nouislider": "15.7.0",
"codemirror": "5.65.7",
Expand Down
15 changes: 10 additions & 5 deletions src/OrchardCore.Modules/OrchardCore.Resources/wwwroot/Scripts/bootstrap.bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
/*!
* Bootstrap v5.3.2 (https://getbootstrap.com/)
* Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Bootstrap v5.3.3 (https://getbootstrap.com/)
* Copyright 2011-2024 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
(function (global, factory) {
Expand Down Expand Up @@ -744,7 +744,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
/**
* Constants
*/
var VERSION = '5.3.2';
var VERSION = '5.3.3';

/**
* Class definition
Expand Down Expand Up @@ -858,9 +858,11 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
if (hrefAttribute.includes('#') && !hrefAttribute.startsWith('#')) {
hrefAttribute = "#".concat(hrefAttribute.split('#')[1]);
}
selector = hrefAttribute && hrefAttribute !== '#' ? parseSelector(hrefAttribute.trim()) : null;
selector = hrefAttribute && hrefAttribute !== '#' ? hrefAttribute.trim() : null;
}
return selector;
return selector ? selector.split(',').map(function (sel) {
return parseSelector(sel);
}).join(',') : null;
};
var SelectorEngine = {
find: function find(selector) {
Expand Down Expand Up @@ -5186,7 +5188,10 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
br: [],
col: [],
code: [],
dd: [],
div: [],
dl: [],
dt: [],
em: [],
hr: [],
h1: [],
Expand Down
Loading
Loading