Skip to content

calculate modal transition duration based on modal-dialog element #27521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XhmikosR merged 1 commit into from
Oct 28, 2018
Merged

calculate modal transition duration based on modal-dialog element #27521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/src/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ class Modal {
}

if (transition) {
const transitionDuration = Util.getTransitionDurationFromElement(this._element)
const transitionDuration = Util.getTransitionDurationFromElement(this._dialog)

$(this._dialog)
.one(Util.TRANSITION_END, transitionComplete)
Expand Down
46 changes: 46 additions & 0 deletions js/tests/unit/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
$(function () {
'use strict'

window.Util = typeof bootstrap !== 'undefined' ? bootstrap.Util : Util

QUnit.module('modal plugin')

QUnit.test('should be defined on jquery object', function (assert) {
Expand Down Expand Up @@ -651,4 +653,48 @@ $(function () {
.bootstrapModal('show')
.bootstrapModal('hide')
})

QUnit.test('transition duration should be the modal-dialog duration before triggering shown event', function (assert) {
assert.expect(2)
var done = assert.async()
var style = [
'<style>',
' .modal.fade .modal-dialog {',
' transition: -webkit-transform .3s ease-out;',
' transition: transform .3s ease-out;',
' transition: transform .3s ease-out,-webkit-transform .3s ease-out;',
' -webkit-transform: translate(0,-50px);',
' transform: translate(0,-50px);',
' }',
'</style>'
].join('')

var $style = $(style).appendTo('head')
var modalHTML = [
'<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">',
' <div class="modal-dialog" role="document">',
' <div class="modal-content">',
' <div class="modal-body">...</div>',
' </div>',
' </div>',
'</div>'
].join('')

var beginTimestamp = 0
var $modal = $(modalHTML).appendTo('#qunit-fixture')
var $modalDialog = $('.modal-dialog')
var transitionDuration = Util.getTransitionDurationFromElement($modalDialog[0])

assert.strictEqual(transitionDuration, 300)

$modal.on('shown.bs.modal', function () {
var diff = Date.now() - beginTimestamp
assert.ok(diff < 400)
$style.remove()
done()
})
.bootstrapModal('show')

beginTimestamp = Date.now()
})
})