diff options
author | Johann-S <johann.servoire@gmail.com> | 2018-03-13 12:38:36 +0300 |
---|---|---|
committer | Johann-S <johann.servoire@gmail.com> | 2018-03-13 14:57:44 +0300 |
commit | 2c41b0aea6b2b1d1f1d812ab4455bea4a0759428 (patch) | |
tree | 69606a554481dae10238eb52e780f77a548e32a8 /js | |
parent | 1fadad1c33b99b94a4a821fe5c62c8064d129424 (diff) |
fix get the transition duration parent
Diffstat (limited to 'js')
-rw-r--r-- | js/src/util.js | 9 | ||||
-rw-r--r-- | js/tests/unit/util.js | 19 |
2 files changed, 11 insertions, 17 deletions
diff --git a/js/src/util.js b/js/src/util.js index 05a69977c2..1b1f13beae 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -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 }, diff --git a/js/tests/unit/util.js b/js/tests/unit/util.js index 46b1e35fec..c4f9459f99 100644 --- a/js/tests/unit/util.js +++ b/js/tests/unit/util.js @@ -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) { |