diff options
| author | Jacob <jacobthornton@gmail.com> | 2014-06-12 09:44:04 +0400 |
|---|---|---|
| committer | Jacob <jacobthornton@gmail.com> | 2014-06-12 09:44:04 +0400 |
| commit | 696632d7dac91dba3f83c056263b527c56b63991 (patch) | |
| tree | c9eeb984ea93fdc90a87126018ff8a4dd747d869 /js/collapse.js | |
| parent | 51e1b01c4b1c95bdd9c2eb15c45028090c2673f5 (diff) | |
| parent | 7f122be0041ff2d4314a196d53d32dc5f295ed02 (diff) | |
Merge pull request #13786 from twbs/fat-13430
add special transitionend type to test event origin
Diffstat (limited to 'js/collapse.js')
| -rw-r--r-- | js/collapse.js | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/js/collapse.js b/js/collapse.js index fae48a768f..2fb3570e99 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -61,18 +61,12 @@ this.transitioning = 1 - var complete = function (e) { - if (e && e.target != this.$element[0]) { - this.$element - .one($.support.transition.end, $.proxy(complete, this)) - return - } + var complete = function () { this.$element .removeClass('collapsing') .addClass('collapse in')[dimension]('') this.transitioning = 0 this.$element - .off($.support.transition.end + '.bs.collapse') .trigger('shown.bs.collapse') } @@ -81,7 +75,7 @@ var scrollSize = $.camelCase(['scroll', dimension].join('-')) this.$element - .on($.support.transition.end + '.bs.collapse', $.proxy(complete, this)) + .one('bsTransitionEnd', $.proxy(complete, this)) .emulateTransitionEnd(350)[dimension](this.$element[0][scrollSize]) } @@ -103,12 +97,7 @@ this.transitioning = 1 - var complete = function (e) { - if (e && e.target != this.$element[0]) { - this.$element - .one($.support.transition.end, $.proxy(complete, this)) - return - } + var complete = function () { this.transitioning = 0 this.$element .trigger('hidden.bs.collapse') @@ -120,7 +109,7 @@ this.$element [dimension](0) - .one($.support.transition.end, $.proxy(complete, this)) + .one('bsTransitionEnd', $.proxy(complete, this)) .emulateTransitionEnd(350) } |