Skip to content

Commit ab412b2

Browse files
committed
grunt
1 parent bc41570 commit ab412b2

17 files changed

+48
-148
lines changed

dist/css/bootstrap-theme.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.css

Lines changed: 12 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/bootstrap.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ if (typeof jQuery === 'undefined') {
1111
+function ($) {
1212
'use strict';
1313
var version = $.fn.jquery.split(' ')[0].split('.')
14-
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {
15-
throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher')
14+
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 2)) {
15+
throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3')
1616
}
1717
}(jQuery);
1818

@@ -795,7 +795,7 @@ if (typeof jQuery === 'undefined') {
795795
if (e.isDefaultPrevented()) return
796796

797797
$this.attr('aria-expanded', 'false')
798-
$parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
798+
$parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget))
799799
})
800800
}
801801

@@ -829,7 +829,7 @@ if (typeof jQuery === 'undefined') {
829829

830830
$parent
831831
.toggleClass('open')
832-
.trigger('shown.bs.dropdown', relatedTarget)
832+
.trigger($.Event('shown.bs.dropdown', relatedTarget))
833833
}
834834

835835
return false

dist/js/bootstrap.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/css/docs.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)