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

Merge pull request #13330 from Kronuz/patch-1

Browse Source 
Wait for the expected target during a collapse
This commit is contained in:
Chris Rebert
2014-04-15 21:38:45 -07:00
parent 1254c322fa 82b066f0a9
commit d08f7dd807
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/collapse.js
View File

@@ -56,7 +56,11 @@
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')
@@ -92,7 +96,11 @@
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')