From c9055f391b3782d96d16fb6efa4337dc90120635 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 1 Jun 2019 18:45:07 +1000 Subject: Linting changes --- src/js/listeners.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'src/js/listeners.js') diff --git a/src/js/listeners.js b/src/js/listeners.js index d4d7bb32..cedcae69 100644 --- a/src/js/listeners.js +++ b/src/js/listeners.js @@ -147,7 +147,7 @@ class Listeners { player.loop = !player.loop; break; - /* case 73: + /* case 73: this.setLoop('start'); break; @@ -275,17 +275,16 @@ class Listeners { elements.container, 'mousemove mouseleave touchstart touchmove enterfullscreen exitfullscreen', event => { - const { controls } = elements; + const { controls: controlsElement } = elements; // Remove button states for fullscreen - if (controls && event.type === 'enterfullscreen') { - controls.pressed = false; - controls.hover = false; + if (controlsElement && event.type === 'enterfullscreen') { + controlsElement.pressed = false; + controlsElement.hover = false; } // Show, then hide after a timeout unless another control event occurs const show = ['touchstart', 'touchmove', 'mousemove'].includes(event.type); - let delay = 0; if (show) { @@ -351,7 +350,6 @@ class Listeners { } const isEnter = event.type === 'enterfullscreen'; - // Set the player size when entering fullscreen to viewport size const { padding, ratio } = setPlayerSize(isEnter); @@ -542,7 +540,6 @@ class Listeners { controls() { const { player } = this; const { elements } = player; - // IE doesn't support input event, so we fallback to change const inputEvent = browser.isIE ? 'change' : 'input'; @@ -678,7 +675,6 @@ class Listeners { // Was playing before? const play = seek.hasAttribute(attribute); - // Done seeking const done = ['mouseup', 'touchend', 'keyup'].includes(event.type); @@ -706,7 +702,6 @@ class Listeners { inputEvent, event => { const seek = event.currentTarget; - // If it exists, use seek-value instead of "value" for consistency with tooltip time (#954) let seekTo = seek.getAttribute('seek-value'); @@ -806,7 +801,7 @@ class Listeners { // Show controls when they receive focus (e.g., when using keyboard tab key) this.bind(elements.controls, 'focusin', () => { - const { config, elements, timers } = player; + const { config, timers } = player; // Skip transition to prevent focus from scrolling the parent element toggleClass(elements.controls, config.classNames.noTransition, true); @@ -837,10 +832,8 @@ class Listeners { // Detect "natural" scroll - suppored on OS X Safari only // Other browsers on OS X will be inverted until support improves const inverted = event.webkitDirectionInvertedFromDevice; - // Get delta from event. Invert if `inverted` is true const [x, y] = [event.deltaX, -event.deltaY].map(value => (inverted ? -value : value)); - // Using the biggest delta, normalize to 1 or -1 (or 0 if no delta) const direction = Math.sign(Math.abs(x) > Math.abs(y) ? x : y); -- cgit v1.2.3 From 0249772f019762ebd494ac409e597103820413c3 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sat, 1 Jun 2019 19:50:29 +1000 Subject: Clean up --- src/js/listeners.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/js/listeners.js') diff --git a/src/js/listeners.js b/src/js/listeners.js index cedcae69..f5c9cda8 100644 --- a/src/js/listeners.js +++ b/src/js/listeners.js @@ -337,8 +337,8 @@ class Listeners { }; const resized = () => { - window.clearTimeout(timers.resized); - timers.resized = window.setTimeout(setPlayerSize, 50); + clearTimeout(timers.resized); + timers.resized = setTimeout(setPlayerSize, 50); }; on.call(player, elements.container, 'enterfullscreen exitfullscreen', event => { -- cgit v1.2.3 From 15cbae8a19dec5745f57377e7c4197ccbaead7ee Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 2 Jun 2019 22:25:44 +1000 Subject: Removed commented out code for Edge --- src/js/listeners.js | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/js/listeners.js') diff --git a/src/js/listeners.js b/src/js/listeners.js index f5c9cda8..fe8d7d3c 100644 --- a/src/js/listeners.js +++ b/src/js/listeners.js @@ -301,14 +301,6 @@ class Listeners { }, ); - // Force edge to repaint on exit fullscreen - // TODO: Fix weird bug where Edge doesn't re-draw when exiting fullscreen - /* if (browser.isEdge) { - on.call(player, elements.container, 'exitfullscreen', () => { - setTimeout(() => repaint(elements.container), 100); - }); - } */ - // Set a gutter for Vimeo const setGutter = (ratio, padding, toggle) => { if (!player.isVimeo) { -- cgit v1.2.3 From 97d9228bed639f0c20b1f21468dd3f181af6b262 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Mon, 3 Jun 2019 20:13:16 +1000 Subject: Aspect ratio tweaks --- src/js/listeners.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/js/listeners.js') diff --git a/src/js/listeners.js b/src/js/listeners.js index fe8d7d3c..c5076ff3 100644 --- a/src/js/listeners.js +++ b/src/js/listeners.js @@ -336,8 +336,13 @@ class Listeners { on.call(player, elements.container, 'enterfullscreen exitfullscreen', event => { const { target, usingNative } = player.fullscreen; - // Ignore for iOS native - if (!player.isEmbed || target !== elements.container) { + // Ignore events not from target + if (target !== elements.container) { + return; + } + + // If it's not an embed and no ratio specified + if (!player.isEmbed && is.empty(player.config.ratio)) { return; } -- cgit v1.2.3