mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-11 16:14:04 +02:00
Code Issues Releases Wiki Activity

grunt dist

Browse Source
This commit is contained in:
Mark Otto
2014-04-17 00:56:22 -07:00
parent d08f7dd807
commit 06fb9406bd
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dist/js/bootstrap.js vendored
View File

@@ -516,7 +516,11 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.transitioning = 1 this.transitioning = 1
var complete = function (e) { var complete = function (e) {
if (e && e.target != this.$element[0]) return if (e && e.target != this.$element[0]) {
this.$element
.one($.support.transition.end, $.proxy(complete, this))
return
}
this.$element this.$element
.removeClass('collapsing') .removeClass('collapsing')
.addClass('collapse in')[dimension]('auto') .addClass('collapse in')[dimension]('auto')
@@ -552,7 +556,11 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.transitioning = 1 this.transitioning = 1
var complete = function (e) { var complete = function (e) {
if (e && e.target != this.$element[0]) return if (e && e.target != this.$element[0]) {
this.$element
.one($.support.transition.end, $.proxy(complete, this))
return
}
this.transitioning = 0 this.transitioning = 0
this.$element this.$element
.trigger('hidden.bs.collapse') .trigger('hidden.bs.collapse')

2
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long