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/js/controls.js | |
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/js/controls.js')
-rw-r--r-- | src/js/controls.js | 4 |
1 files changed, 2 insertions, 2 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`; |