diff options
| author | Sam Potts <me@sampotts.me> | 2018-01-19 14:28:39 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2018-01-19 14:28:39 +1100 |
| commit | 98dd818bf61526fe8e69eb85f0fbd3d4efd249b5 (patch) | |
| tree | efaacbe03b208d5dcaee81fde6f525affa31f0dc /src | |
| parent | 021f6c84605e4e3f2c979d88edd386e36b2a0393 (diff) | |
| parent | 6831c3053470d092c11536a837ebf8c1a8b5c530 (diff) | |
| download | plyr-98dd818bf61526fe8e69eb85f0fbd3d4efd249b5.tar.lz plyr-98dd818bf61526fe8e69eb85f0fbd3d4efd249b5.tar.xz plyr-98dd818bf61526fe8e69eb85f0fbd3d4efd249b5.zip | |
Merge branch 'beta' into beta-with-ads
# Conflicts:
# demo/dist/demo.js
# demo/dist/demo.js.map
# dist/plyr.js
# dist/plyr.js.map
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/controls.js | 4 | ||||
| -rw-r--r-- | src/js/support.js | 2 | ||||
| -rw-r--r-- | src/js/utils.js | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/js/controls.js b/src/js/controls.js index 936bee6b..ea30acec 100644 --- a/src/js/controls.js +++ b/src/js/controls.js @@ -845,11 +845,11 @@ const controls = { container.style.height = ''; // Only listen once - utils.off(container, utils.transitionEnd, restore); + utils.off(container, utils.transitionEndEvent, restore); }; // Listen for the transition finishing and restore auto height/width - utils.on(container, utils.transitionEnd, restore); + utils.on(container, utils.transitionEndEvent, restore); // Set dimensions to target container.style.width = `${size.width}px`; diff --git a/src/js/support.js b/src/js/support.js index f75517d6..23a8ebef 100644 --- a/src/js/support.js +++ b/src/js/support.js @@ -151,7 +151,7 @@ const support = { touch: 'ontouchstart' in document.documentElement, // Detect transitions support - transitions: utils.transitionEnd !== false, + transitions: utils.transitionEndEvent !== false, // Reduced motion iOS & MacOS setting // https://webkit.org/blog/7551/responsive-design-for-motion/ diff --git a/src/js/utils.js b/src/js/utils.js index 1b64fc8d..79ed5861 100644 --- a/src/js/utils.js +++ b/src/js/utils.js @@ -731,7 +731,7 @@ const utils = { }, // Get the transition end event - transitionEnd: (() => { + get transitionEndEvent() { const element = document.createElement('span'); const events = { @@ -743,8 +743,8 @@ const utils = { const type = Object.keys(events).find(event => element.style[event] !== undefined); - return typeof type === 'string' ? type : false; - })(), + return utils.is.string(type) ? events[type] : false; + }, // Force repaint of element repaint(element) { |