Skip to content

Commit

Permalink
fixes #9836
Browse files Browse the repository at this point in the history
  • Loading branch information
fat committed Mar 9, 2014
1 parent 90eb524 commit 4d96e69
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
6 changes: 4 additions & 2 deletions dist/js/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re

this.transitioning = 1

var complete = function () {
var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.$element
.removeClass('collapsing')
.addClass('collapse in')
Expand Down Expand Up @@ -555,7 +556,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re

this.transitioning = 1

var complete = function () {
var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.transitioning = 0
this.$element
.trigger('hidden.bs.collapse')
Expand Down
2 changes: 1 addition & 1 deletion dist/js/bootstrap.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/js/raw-files.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dist/js/bootstrap.min.js

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions js/collapse.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@

this.transitioning = 1

var complete = function () {
var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.$element
.removeClass('collapsing')
.addClass('collapse in')
Expand Down Expand Up @@ -95,7 +96,8 @@

this.transitioning = 1

var complete = function () {
var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.transitioning = 0
this.$element
.trigger('hidden.bs.collapse')
Expand Down
2 changes: 1 addition & 1 deletion test-infra/npm-shrinkwrap.canonical.json

Large diffs are not rendered by default.

0 comments on commit 4d96e69

Please sign in to comment.