diff options
| author | fat <[email protected]> | 2014-06-10 19:56:08 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2014-06-10 20:42:19 -0700 |
| commit | 7f122be0041ff2d4314a196d53d32dc5f295ed02 (patch) | |
| tree | 2723e3f32ad56df27b49285a577d4c9639c17b5a /js/modal.js | |
| parent | 9cdbf0e80702b9a6a772a2d4a81d8d94dbe1c0eb (diff) | |
| download | bootstrap-7f122be0041ff2d4314a196d53d32dc5f295ed02.tar.xz bootstrap-7f122be0041ff2d4314a196d53d32dc5f295ed02.zip | |
add special transitionend type to test event origin
fixes #13430
Diffstat (limited to 'js/modal.js')
| -rw-r--r-- | js/modal.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/modal.js b/js/modal.js index 2c363ec33..6b9b63f54 100644 --- a/js/modal.js +++ b/js/modal.js @@ -89,7 +89,7 @@ transition ? that.$element.find('.modal-dialog') // wait for modal to slide in - .one($.support.transition.end, function () { + .one('bsTransitionEnd', function () { that.$element.trigger('focus').trigger(e) }) .emulateTransitionEnd(300) : @@ -122,7 +122,7 @@ $.support.transition && this.$element.hasClass('fade') ? this.$element - .one($.support.transition.end, $.proxy(this.hideModal, this)) + .one('bsTransitionEnd', $.proxy(this.hideModal, this)) .emulateTransitionEnd(300) : this.hideModal() } @@ -185,7 +185,7 @@ doAnimate ? this.$backdrop - .one($.support.transition.end, callback) + .one('bsTransitionEnd', callback) .emulateTransitionEnd(150) : callback() @@ -198,7 +198,7 @@ } $.support.transition && this.$element.hasClass('fade') ? this.$backdrop - .one($.support.transition.end, callbackRemove) + .one('bsTransitionEnd', callbackRemove) .emulateTransitionEnd(150) : callbackRemove() |