diff options
| author | fat <jacobthornton@gmail.com> | 2014-06-11 06:56:08 +0400 |
|---|---|---|
| committer | fat <jacobthornton@gmail.com> | 2014-06-11 07:42:19 +0400 |
| commit | 7f122be0041ff2d4314a196d53d32dc5f295ed02 (patch) | |
| tree | 2723e3f32ad56df27b49285a577d4c9639c17b5a /js/collapse.js | |
| parent | 9cdbf0e80702b9a6a772a2d4a81d8d94dbe1c0eb (diff) | |
add special transitionend type to test event origin
fixes #13430
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 d5d74d07b9..add4aea921 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) } |