From 97d9228bed639f0c20b1f21468dd3f181af6b262 Mon Sep 17 00:00:00 2001
From: Sam Potts <sam@potts.es>
Date: Mon, 3 Jun 2019 20:13:16 +1000
Subject: Aspect ratio tweaks

---
 src/js/utils/elements.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/js/utils/elements.js')

diff --git a/src/js/utils/elements.js b/src/js/utils/elements.js
index 98b44f13..4f10938e 100644
--- a/src/js/utils/elements.js
+++ b/src/js/utils/elements.js
@@ -192,11 +192,8 @@ export function toggleHidden(element, hidden) {
         hide = !element.hidden;
     }
 
-    if (hide) {
-        element.setAttribute('hidden', '');
-    } else {
-        element.removeAttribute('hidden');
-    }
+    // eslint-disable-next-line no-param-reassign
+    element.hidden = hide;
 }
 
 // Mirror Element.classList.toggle, with IE compatibility for "force" argument
-- 
cgit v1.2.3


From e17da7dfd467e5d970400a32860f6653bcc0f556 Mon Sep 17 00:00:00 2001
From: Kimberley Jensen <kimberley.jensen@laerdal.com>
Date: Fri, 7 Feb 2020 15:00:04 +0100
Subject: Bail out of focus trap if fullscreen is not active

- detailed in https://github.com/sampotts/plyr/issues/1665
---
 src/js/utils/elements.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/js/utils/elements.js')

diff --git a/src/js/utils/elements.js b/src/js/utils/elements.js
index 4f10938e..921d533a 100644
--- a/src/js/utils/elements.js
+++ b/src/js/utils/elements.js
@@ -257,10 +257,11 @@ export function trapFocus(element = null, toggle = false) {
     const focusable = getElements.call(this, 'button:not(:disabled), input:not(:disabled), [tabindex]');
     const first = focusable[0];
     const last = focusable[focusable.length - 1];
+    const player = this;
 
     const trap = event => {
         // Bail if not tab key or not fullscreen
-        if (event.key !== 'Tab' || event.keyCode !== 9) {
+        if (event.key !== 'Tab' || event.keyCode !== 9 || !player.fullscreen.active) {
             return;
         }
 
-- 
cgit v1.2.3


From 2d13ad3d397423e527caa6f3eba9df242505dfff Mon Sep 17 00:00:00 2001
From: Sam Potts <sam@potts.es>
Date: Sun, 9 Feb 2020 21:42:12 +0000
Subject: Focus trap improvements

---
 src/js/utils/elements.js | 35 -----------------------------------
 1 file changed, 35 deletions(-)

(limited to 'src/js/utils/elements.js')

diff --git a/src/js/utils/elements.js b/src/js/utils/elements.js
index 921d533a..b88aad0c 100644
--- a/src/js/utils/elements.js
+++ b/src/js/utils/elements.js
@@ -2,7 +2,6 @@
 // Element utils
 // ==========================================================================
 
-import { toggleListener } from './events';
 import is from './is';
 import { extend } from './objects';
 
@@ -248,40 +247,6 @@ export function getElement(selector) {
     return this.elements.container.querySelector(selector);
 }
 
-// Trap focus inside container
-export function trapFocus(element = null, toggle = false) {
-    if (!is.element(element)) {
-        return;
-    }
-
-    const focusable = getElements.call(this, 'button:not(:disabled), input:not(:disabled), [tabindex]');
-    const first = focusable[0];
-    const last = focusable[focusable.length - 1];
-    const player = this;
-
-    const trap = event => {
-        // Bail if not tab key or not fullscreen
-        if (event.key !== 'Tab' || event.keyCode !== 9 || !player.fullscreen.active) {
-            return;
-        }
-
-        // Get the current focused element
-        const focused = document.activeElement;
-
-        if (focused === last && !event.shiftKey) {
-            // Move focus to first element that can be tabbed if Shift isn't used
-            first.focus();
-            event.preventDefault();
-        } else if (focused === first && event.shiftKey) {
-            // Move focus to last element that can be tabbed if Shift is used
-            last.focus();
-            event.preventDefault();
-        }
-    };
-
-    toggleListener.call(this, this.elements.container, 'keydown', trap, toggle, false);
-}
-
 // Set focus and tab focus class
 export function setFocus(element = null, tabFocus = false) {
     if (!is.element(element)) {
-- 
cgit v1.2.3


From c7bf0c5c03a5c7716a39a0f2f5a11681eedbac7f Mon Sep 17 00:00:00 2001
From: Jesper <jesper_noordsij@hotmail.com>
Date: Tue, 10 Mar 2020 09:19:34 +0100
Subject: Fix prototype used for selector matcher function

---
 src/js/utils/elements.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/js/utils/elements.js')

diff --git a/src/js/utils/elements.js b/src/js/utils/elements.js
index b88aad0c..43f46416 100644
--- a/src/js/utils/elements.js
+++ b/src/js/utils/elements.js
@@ -221,7 +221,7 @@ export function hasClass(element, className) {
 
 // Element matches selector
 export function matches(element, selector) {
-    const prototype = { Element };
+    const prototype = Element.prototype;
 
     function match() {
         return Array.from(document.querySelectorAll(selector)).includes(this);
-- 
cgit v1.2.3