mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
grunt
This commit is contained in:
parent
68b771a057
commit
bf2ad00ee0
6 changed files with 36 additions and 16 deletions
20
dist/js/bootstrap.js
vendored
20
dist/js/bootstrap.js
vendored
|
@ -496,7 +496,7 @@ if (typeof jQuery === 'undefined') {
|
||||||
// CAROUSEL DATA-API
|
// CAROUSEL DATA-API
|
||||||
// =================
|
// =================
|
||||||
|
|
||||||
$(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
|
var clickHandler = function (e) {
|
||||||
var href
|
var href
|
||||||
var $this = $(this)
|
var $this = $(this)
|
||||||
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
|
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
|
||||||
|
@ -512,7 +512,11 @@ if (typeof jQuery === 'undefined') {
|
||||||
}
|
}
|
||||||
|
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
})
|
}
|
||||||
|
|
||||||
|
$(document)
|
||||||
|
.on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
|
||||||
|
.on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)
|
||||||
|
|
||||||
$(window).on('load', function () {
|
$(window).on('load', function () {
|
||||||
$('[data-ride="carousel"]').each(function () {
|
$('[data-ride="carousel"]').each(function () {
|
||||||
|
@ -891,7 +895,9 @@ if (typeof jQuery === 'undefined') {
|
||||||
.on('click.bs.dropdown.data-api', clearMenus)
|
.on('click.bs.dropdown.data-api', clearMenus)
|
||||||
.on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
|
.on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
|
||||||
.on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
.on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
||||||
.on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown)
|
.on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
|
||||||
|
.on('keydown.bs.dropdown.data-api', '[role="menu"]', Dropdown.prototype.keydown)
|
||||||
|
.on('keydown.bs.dropdown.data-api', '[role="listbox"]', Dropdown.prototype.keydown)
|
||||||
|
|
||||||
}(jQuery);
|
}(jQuery);
|
||||||
|
|
||||||
|
@ -2095,10 +2101,14 @@ if (typeof jQuery === 'undefined') {
|
||||||
// TAB DATA-API
|
// TAB DATA-API
|
||||||
// ============
|
// ============
|
||||||
|
|
||||||
$(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
|
var clickHandler = function (e) {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
Plugin.call($(this), 'show')
|
Plugin.call($(this), 'show')
|
||||||
})
|
}
|
||||||
|
|
||||||
|
$(document)
|
||||||
|
.on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler)
|
||||||
|
.on('click.bs.tab.data-api', '[data-toggle="pill"]', clickHandler)
|
||||||
|
|
||||||
}(jQuery);
|
}(jQuery);
|
||||||
|
|
||||||
|
|
4
dist/js/bootstrap.min.js
vendored
4
dist/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
2
docs/assets/js/customize.min.js
vendored
2
docs/assets/js/customize.min.js
vendored
File diff suppressed because one or more lines are too long
2
docs/assets/js/raw-files.min.js
vendored
2
docs/assets/js/raw-files.min.js
vendored
File diff suppressed because one or more lines are too long
20
docs/dist/js/bootstrap.js
vendored
20
docs/dist/js/bootstrap.js
vendored
|
@ -496,7 +496,7 @@ if (typeof jQuery === 'undefined') {
|
||||||
// CAROUSEL DATA-API
|
// CAROUSEL DATA-API
|
||||||
// =================
|
// =================
|
||||||
|
|
||||||
$(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
|
var clickHandler = function (e) {
|
||||||
var href
|
var href
|
||||||
var $this = $(this)
|
var $this = $(this)
|
||||||
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
|
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
|
||||||
|
@ -512,7 +512,11 @@ if (typeof jQuery === 'undefined') {
|
||||||
}
|
}
|
||||||
|
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
})
|
}
|
||||||
|
|
||||||
|
$(document)
|
||||||
|
.on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
|
||||||
|
.on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)
|
||||||
|
|
||||||
$(window).on('load', function () {
|
$(window).on('load', function () {
|
||||||
$('[data-ride="carousel"]').each(function () {
|
$('[data-ride="carousel"]').each(function () {
|
||||||
|
@ -891,7 +895,9 @@ if (typeof jQuery === 'undefined') {
|
||||||
.on('click.bs.dropdown.data-api', clearMenus)
|
.on('click.bs.dropdown.data-api', clearMenus)
|
||||||
.on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
|
.on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
|
||||||
.on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
.on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
||||||
.on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown)
|
.on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
|
||||||
|
.on('keydown.bs.dropdown.data-api', '[role="menu"]', Dropdown.prototype.keydown)
|
||||||
|
.on('keydown.bs.dropdown.data-api', '[role="listbox"]', Dropdown.prototype.keydown)
|
||||||
|
|
||||||
}(jQuery);
|
}(jQuery);
|
||||||
|
|
||||||
|
@ -2095,10 +2101,14 @@ if (typeof jQuery === 'undefined') {
|
||||||
// TAB DATA-API
|
// TAB DATA-API
|
||||||
// ============
|
// ============
|
||||||
|
|
||||||
$(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
|
var clickHandler = function (e) {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
Plugin.call($(this), 'show')
|
Plugin.call($(this), 'show')
|
||||||
})
|
}
|
||||||
|
|
||||||
|
$(document)
|
||||||
|
.on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler)
|
||||||
|
.on('click.bs.tab.data-api', '[data-toggle="pill"]', clickHandler)
|
||||||
|
|
||||||
}(jQuery);
|
}(jQuery);
|
||||||
|
|
||||||
|
|
4
docs/dist/js/bootstrap.min.js
vendored
4
docs/dist/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue