Skip to content

Commit

Permalink
v4.4.3
Browse files Browse the repository at this point in the history
Enable support for bootstrap 5.0.2 (5.0.1 unsupported)
Update examples to JQuery 3.6.0

#41
  • Loading branch information
GedMarc committed May 17, 2022
1 parent 50db31a commit 67ebcab
Show file tree
Hide file tree
Showing 8 changed files with 1,270 additions and 7 deletions.
7 changes: 6 additions & 1 deletion dist/js/bootstrap-dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
var BootstrapDialogModal = function (element, options) {
if(bootstrap && bootstrap.Modal && /^5\.1\./.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);
} else if (/4\.1\.\d+/.test($.fn.modal.Constructor.VERSION)) { //FIXME for BootstrapV4
return new Modal(element, options);
} else {
Expand All @@ -52,7 +54,10 @@
var version = null;
if(bootstrap && bootstrap.Modal && /^5\.1\./.test(bootstrap.Modal.VERSION)) {
version = 'v5.1';
} else if (typeof $.fn.modal.Constructor.VERSION === 'undefined') {
} else if(bootstrap && bootstrap.Modal && /^5\.0\.2/.test(bootstrap.Modal.VERSION)) {
version = 'v5.1';
}
else if (typeof $.fn.modal.Constructor.VERSION === 'undefined') {
version = 'v3.1';
} else if (/3\.2\.\d+/.test($.fn.modal.Constructor.VERSION)) {
version = 'v3.2';
Expand Down
2 changes: 1 addition & 1 deletion dist/js/bootstrap-dialog.min.js

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion examples/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<link href="libs/bootstrap.min.css?v=5.10" rel="stylesheet" type="text/css">

<link href="../dist/css/bootstrap-dialog.min.css" rel="stylesheet" type="text/css">

<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/fontawesome.min.css"/>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/solid.min.css"/>
<script src="libs/jquery.min.js?v=3.31" type="text/javascript"></script>

<script src="libs/jquery.min.js?v=3.6" type="text/javascript"></script>
<script src="libs/popper.min.js?v=4.13" type="text/javascript"></script>
<script src="libs/bootstrap.min.js?v=5.10" type="text/javascript"></script>

Expand Down
Loading

0 comments on commit 67ebcab

Please sign in to comment.