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

Add Bootstrap 5 support #798

Closed
wants to merge 19 commits into from
Closed

Add Bootstrap 5 support #798

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
095b789
Update Karma to use chrome.
jstark518 Oct 21, 2021
b133905
Move dependencies to the correct area
jstark518 Oct 21, 2021
6d7c6ef
Missing lock file for some reason
jstark518 Oct 21, 2021
23f5430
Add support for bootstrap 5
jstark518 Oct 21, 2021
1107fc1
Update Dist
jstark518 Nov 30, 2021
bbd877c
Add float for close without title, and add the code to all.
jstark518 Nov 30, 2021
6a61be8
Bump follow-redirects from 1.14.4 to 1.14.8
dependabot[bot] Feb 15, 2022
aed56d5
Bump log4js from 6.3.0 to 6.4.1
dependabot[bot] Feb 15, 2022
426b7b2
Bump minimist from 1.2.5 to 1.2.6
dependabot[bot] Apr 1, 2022
5864253
Merge pull request #4 from jstark518/dependabot/npm_and_yarn/log4js-6…
jstark518 Apr 3, 2022
226e2a8
Merge pull request #3 from jstark518/dependabot/npm_and_yarn/follow-r…
jstark518 Apr 3, 2022
c1e9894
Merge pull request #6 from jstark518/dependabot/npm_and_yarn/minimist…
jstark518 Apr 3, 2022
8f2c6af
Bump karma from 6.3.5 to 6.3.16
dependabot[bot] Apr 3, 2022
c1f0531
Merge pull request #5 from jstark518/dependabot/npm_and_yarn/karma-6.…
dependabot[bot] Apr 3, 2022
8eae4bd
Bump grunt from 1.4.1 to 1.5.2
dependabot[bot] Apr 27, 2022
e95ed47
Merge pull request #7 from jstark518/dependabot/npm_and_yarn/grunt-1.5.2
jstark518 Apr 27, 2022
cbeeddf
Bump async from 3.2.1 to 3.2.3
dependabot[bot] Apr 27, 2022
02b3089
Merge pull request #8 from jstark518/dependabot/npm_and_yarn/async-3.2.3
jstark518 Apr 27, 2022
8c58170
Create npm-grunt.yml
jstark518 Apr 28, 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
8 changes: 6 additions & 2 deletions bootbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@
footer:
'<div class="modal-footer"></div>',
closeButton:
'<button type="button" class="bootbox-close-button btn-close" data-bs-dismiss="modal" aria-label="Close"></button>',
closeButton_bs_3_4:
'<button type="button" class="bootbox-close-button close" aria-hidden="true">&times;</button>',
form:
'<form class="bootbox-form"></form>',
Expand Down Expand Up @@ -358,7 +360,7 @@
}

if (options.closeButton) {
var closeButton = $(templates.closeButton);
var closeButton = $(options.bootstrap >= 5 ? templates.closeButton : templates.closeButton_bs_3_4);

if (options.title) {
if (options.bootstrap > 3) {
Expand Down Expand Up @@ -789,7 +791,9 @@
});

// safe to set a select's value as per a normal input
input.val(options.value);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#798 This was causing problems with the existing test

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http://jsfiddle.net/osuzjbxg/1

if(options.value) {
input.val(options.value);
}

break;

Expand Down
2 changes: 1 addition & 1 deletion karma-base.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = function(params) {
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['PhantomJS'],
browsers: ['Chrome'],
captureTimeout: 60000,
singleRun: true,

Expand Down
9 changes: 9 additions & 0 deletions karma-bs4.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
var baseConfig = require('./karma-base.conf');

module.exports = baseConfig({
vendor: [
'tests/vendor/jquery-3.3.1.slim.min.js',
'tests/vendor/bootstrap-4.3.1.bundle.min.js'
],
src: ['bootbox.js', 'bootbox.locales.js']
});
4 changes: 2 additions & 2 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var baseConfig = require('./karma-base.conf');
module.exports = baseConfig({
vendor: [
'tests/vendor/jquery-3.3.1.slim.min.js',
'tests/vendor/bootstrap-4.3.1.bundle.min.js'
'tests/vendor/bootstrap-5.1.3.bundle.min.js'
],
src: ['bootbox.js', 'bootbox.locales.js']
});
});
Loading