aboutsummaryrefslogtreecommitdiffstats
path: root/src/js/ui.js
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2019-06-21 00:12:10 +1000
committerGitHub <noreply@github.com>2019-06-21 00:12:10 +1000
commit95092edc93d713b927c637cefc27945f8537d565 (patch)
tree27464f2f98a519f78ff3cc4a2c49ebdd5c6dab2c /src/js/ui.js
parent1e761e237aceb49b29291946a39eef958d6da966 (diff)
parentc4b3e0672e86f2a2786f315bf8f54250cd1f7f78 (diff)
downloadplyr-95092edc93d713b927c637cefc27945f8537d565.tar.lz
plyr-95092edc93d713b927c637cefc27945f8537d565.tar.xz
plyr-95092edc93d713b927c637cefc27945f8537d565.zip
Merge pull request #1472 from sampotts/develop
v3.5.5
Diffstat (limited to 'src/js/ui.js')
-rw-r--r--src/js/ui.js15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/js/ui.js b/src/js/ui.js
index 50de7df1..df52eb64 100644
--- a/src/js/ui.js
+++ b/src/js/ui.js
@@ -213,7 +213,7 @@ const ui = {
// Set state
Array.from(this.elements.buttons.play || []).forEach(target => {
- target.pressed = this.playing;
+ Object.assign(target, { pressed: this.playing });
});
// Only update controls on non timeupdate events
@@ -247,15 +247,22 @@ const ui = {
// Toggle controls based on state and `force` argument
toggleControls(force) {
- const { controls } = this.elements;
+ const { controls: controlsElement } = this.elements;
- if (controls && this.config.hideControls) {
+ if (controlsElement && this.config.hideControls) {
// Don't hide controls if a touch-device user recently seeked. (Must be limited to touch devices, or it occasionally prevents desktop controls from hiding.)
const recentTouchSeek = this.touch && this.lastSeekTime + 2000 > Date.now();
// Show controls if force, loading, paused, button interaction, or recent seek, otherwise hide
this.toggleControls(
- Boolean(force || this.loading || this.paused || controls.pressed || controls.hover || recentTouchSeek),
+ Boolean(
+ force ||
+ this.loading ||
+ this.paused ||
+ controlsElement.pressed ||
+ controlsElement.hover ||
+ recentTouchSeek,
+ ),
);
}
},