kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Merge pull request #12983 from twbs/fat-9836

Browse source 
fixes #9836
This commit is contained in:
Mark Otto 2014-03-08 20:10:04 -08:00
commit e4d13e238d
7 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dist/js/bootstrap.js vendored
View file

@ -516,7 +516,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.transitioning = 1 this.transitioning = 1
var complete = function () { var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.$element this.$element
.removeClass('collapsing') .removeClass('collapsing')
.addClass('collapse in') .addClass('collapse in')
@ -555,7 +556,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.transitioning = 1 this.transitioning = 1
var complete = function () { var complete = function (e) {
if (e && e.target != this.$element[0]) 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/assets/js/customize.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
docs/assets/js/raw-files.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

6
js/collapse.js
View file

@ -56,7 +56,8 @@
this.transitioning = 1 this.transitioning = 1
var complete = function () { var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.$element this.$element
.removeClass('collapsing') .removeClass('collapsing')
.addClass('collapse in') .addClass('collapse in')
@ -95,7 +96,8 @@
this.transitioning = 1 this.transitioning = 1
var complete = function () { var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.transitioning = 0 this.transitioning = 0
this.$element this.$element
.trigger('hidden.bs.collapse') .trigger('hidden.bs.collapse')

2
test-infra/npm-shrinkwrap.canonical.json
View file

File diff suppressed because one or more lines are too long