Skip to content

Bootstrap 5.2 or newer compatibility. #46

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

Merged
GedMarc merged 3 commits into from
Aug 10, 2022
Merged

Bootstrap 5.2 or newer compatibility. #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2a30cc
Bootstrap 5.2 or newer compatibility.
Dmitri-Sintsov Aug 5, 2022
6bb9571
Updated minified version of script.
Dmitri-Sintsov Aug 9, 2022
50c0b41
Minified version of script.
Dmitri-Sintsov Aug 9, 2022
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
4 changes: 2 additions & 2 deletions dist/js/bootstrap-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* ================================================ */
var Modal = bootstrap.Modal ? bootstrap.Modal : $.fn.modal.Constructor;
var BootstrapDialogModal = function (element, options) {
if(bootstrap && bootstrap.Modal && /^5\.1\./.test(bootstrap.Modal.VERSION)) {
if(bootstrap && bootstrap.Modal && /^5\.[^\D0]\./.test(bootstrap.Modal.VERSION)) {
return new Modal(element, options);
} else if(bootstrap && bootstrap.Modal && /^5\.0\.2/.test(bootstrap.Modal.VERSION)) {
return new Modal(element, options);
Expand All @@ -52,7 +52,7 @@
};
BootstrapDialogModal.getModalVersion = function () {
var version = null;
if(bootstrap && bootstrap.Modal && /^5\.1\./.test(bootstrap.Modal.VERSION)) {
if(bootstrap && bootstrap.Modal && /^5\.[^\D0]\./.test(bootstrap.Modal.VERSION)) {
version = 'v5.1';
//not compatible with 5.0.1, regex upper bounds would have been better
} else if(bootstrap && bootstrap.Modal && /^5\.0\.[23456789]/.test(bootstrap.Modal.VERSION)) {
Expand Down
2 changes: 1 addition & 1 deletion dist/js/bootstrap-dialog.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/js/bootstrap-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* ================================================ */
var Modal = bootstrap.Modal ? bootstrap.Modal : $.fn.modal.Constructor;
var BootstrapDialogModal = function (element, options) {
if(bootstrap && bootstrap.Modal && /^5\.1\./.test(bootstrap.Modal.VERSION)) {
if(bootstrap && bootstrap.Modal && /^5\.[^\D0]\./.test(bootstrap.Modal.VERSION)) {
return new Modal(element, options);
} else if(bootstrap && bootstrap.Modal && /^5\.0\.2/.test(bootstrap.Modal.VERSION)) {
return new Modal(element, options);
Expand All @@ -52,7 +52,7 @@
};
BootstrapDialogModal.getModalVersion = function () {
var version = null;
if(bootstrap && bootstrap.Modal && /^5\.1\./.test(bootstrap.Modal.VERSION)) {
if(bootstrap && bootstrap.Modal && /^5\.[^\D0]\./.test(bootstrap.Modal.VERSION)) {
version = 'v5.1';
//not compatible with 5.0.1, regex upper bounds would have been better
} else if(bootstrap && bootstrap.Modal && /^5\.0\.[23456789]/.test(bootstrap.Modal.VERSION)) {
Expand Down
2 changes: 1 addition & 1 deletion src/js/bootstrap-dialog.min.js
View file
Open in desktop

Large diffs are not rendered by default.