Skip to content
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

fix get the transition duration parent #25834

Merged
merged 1 commit into from
Mar 13, 2018
Merged

fix get the transition duration parent #25834

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
9 changes: 6 additions & 3 deletions js/src/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,19 +106,22 @@ const Util = (($) => {
},

getTransitionDurationFromElement(element) {
if (!element) {
return 0
}

// Get transition-duration of the element
let transitionDuration = $(element).css('transition-duration')
const floatTransitionDuration = parseFloat(transitionDuration)

// Return 0 if element or transition duration is not found
if (!transitionDuration) {
if (!floatTransitionDuration) {
return 0
}

// If multiple durations are defined, take the first
transitionDuration = transitionDuration.split(',')[0]

// jQuery always converts transition durations into seconds,
// so multiply by 1000
return parseFloat(transitionDuration) * MILLISECONDS_MULTIPLIER
},

Expand Down
19 changes: 5 additions & 14 deletions js/tests/unit/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,44 +46,35 @@ $(function () {
assert.expect(1)
var $div = $('<div style="transition: all 300ms ease-out;"></div>').appendTo($('#qunit-fixture'))

assert.strictEqual(Util.getTransitionDurationFromElement($div), 300)
assert.strictEqual(Util.getTransitionDurationFromElement($div[0]), 300)
})

QUnit.test('Util.getTransitionDurationFromElement should accept transition durations in seconds', function (assert) {
assert.expect(1)
var $div = $('<div style="transition: all .4s ease-out;"></div>').appendTo($('#qunit-fixture'))

assert.strictEqual(Util.getTransitionDurationFromElement($div), 400)
assert.strictEqual(Util.getTransitionDurationFromElement($div[0]), 400)
})

QUnit.test('Util.getTransitionDurationFromElement should get the first transition duration if multiple transition durations are defined', function (assert) {
assert.expect(1)
var $div = $('<div style="transition: transform .3s ease-out, opacity .2s;"></div>').appendTo($('#qunit-fixture'))

assert.strictEqual(Util.getTransitionDurationFromElement($div), 300)
assert.strictEqual(Util.getTransitionDurationFromElement($div[0]), 300)
})

QUnit.test('Util.getTransitionDurationFromElement should return 0 if transition duration is not defined', function (assert) {
assert.expect(1)
var $div = $('<div></div>').appendTo($('#qunit-fixture'))

assert.strictEqual(Util.getTransitionDurationFromElement($div), 0)
assert.strictEqual(Util.getTransitionDurationFromElement($div[0]), 0)
})

QUnit.test('Util.getTransitionDurationFromElement should return 0 if element is not found in DOM', function (assert) {
assert.expect(1)
var $div = $('#fake-id')

assert.strictEqual(Util.getTransitionDurationFromElement($div), 0)
})

QUnit.test('Util.getTransitionDurationFromElement should properly handle inherited transition durations', function (assert) {
assert.expect(1)
var $parent = $('<div style="transition-duration: 5s;"></div>')
var $child = $('<div style="transition-duration: inherit;"></div>')
$('#qunit-fixture').append($parent.append($child))

assert.strictEqual(Util.getTransitionDurationFromElement($child), 5000)
assert.strictEqual(Util.getTransitionDurationFromElement($div[0]), 0)
})

QUnit.test('Util.getUID should generate a new id uniq', function (assert) {
Expand Down