Skip to content

Commit bf2ad00

Browse files
committed
grunt
1 parent 68b771a commit bf2ad00

File tree

6 files changed

+36
-16
lines changed

6 files changed

+36
-16
lines changed

dist/js/bootstrap.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ if (typeof jQuery === 'undefined') {
496496
// CAROUSEL DATA-API
497497
// =================
498498

499-
$(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
499+
var clickHandler = function (e) {
500500
var href
501501
var $this = $(this)
502502
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
@@ -512,7 +512,11 @@ if (typeof jQuery === 'undefined') {
512512
}
513513

514514
e.preventDefault()
515-
})
515+
}
516+
517+
$(document)
518+
.on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
519+
.on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)
516520

517521
$(window).on('load', function () {
518522
$('[data-ride="carousel"]').each(function () {
@@ -891,7 +895,9 @@ if (typeof jQuery === 'undefined') {
891895
.on('click.bs.dropdown.data-api', clearMenus)
892896
.on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
893897
.on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
894-
.on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown)
898+
.on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
899+
.on('keydown.bs.dropdown.data-api', '[role="menu"]', Dropdown.prototype.keydown)
900+
.on('keydown.bs.dropdown.data-api', '[role="listbox"]', Dropdown.prototype.keydown)
895901

896902
}(jQuery);
897903

@@ -2095,10 +2101,14 @@ if (typeof jQuery === 'undefined') {
20952101
// TAB DATA-API
20962102
// ============
20972103

2098-
$(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
2104+
var clickHandler = function (e) {
20992105
e.preventDefault()
21002106
Plugin.call($(this), 'show')
2101-
})
2107+
}
2108+
2109+
$(document)
2110+
.on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler)
2111+
.on('click.bs.tab.data-api', '[data-toggle="pill"]', clickHandler)
21022112

21032113
}(jQuery);
21042114

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/js/customize.min.js

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

docs/assets/js/raw-files.min.js

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

docs/dist/js/bootstrap.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ if (typeof jQuery === 'undefined') {
496496
// CAROUSEL DATA-API
497497
// =================
498498

499-
$(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
499+
var clickHandler = function (e) {
500500
var href
501501
var $this = $(this)
502502
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
@@ -512,7 +512,11 @@ if (typeof jQuery === 'undefined') {
512512
}
513513

514514
e.preventDefault()
515-
})
515+
}
516+
517+
$(document)
518+
.on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
519+
.on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)
516520

517521
$(window).on('load', function () {
518522
$('[data-ride="carousel"]').each(function () {
@@ -891,7 +895,9 @@ if (typeof jQuery === 'undefined') {
891895
.on('click.bs.dropdown.data-api', clearMenus)
892896
.on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
893897
.on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
894-
.on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown)
898+
.on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
899+
.on('keydown.bs.dropdown.data-api', '[role="menu"]', Dropdown.prototype.keydown)
900+
.on('keydown.bs.dropdown.data-api', '[role="listbox"]', Dropdown.prototype.keydown)
895901

896902
}(jQuery);
897903

@@ -2095,10 +2101,14 @@ if (typeof jQuery === 'undefined') {
20952101
// TAB DATA-API
20962102
// ============
20972103

2098-
$(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
2104+
var clickHandler = function (e) {
20992105
e.preventDefault()
21002106
Plugin.call($(this), 'show')
2101-
})
2107+
}
2108+
2109+
$(document)
2110+
.on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler)
2111+
.on('click.bs.tab.data-api', '[data-toggle="pill"]', clickHandler)
21022112

21032113
}(jQuery);
21042114

docs/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.

0 commit comments

Comments
 (0)