From a095a64f90e19f5e26b3d63f54e1fdbdbe805632 Mon Sep 17 00:00:00 2001
From: Daniel Sarin <daniel.sarin@gmail.com>
Date: Wed, 11 Apr 2018 15:13:34 +0300
Subject: Increase menu container z-index to be higher than controls

---
 src/sass/components/menus.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/sass/components/menus.scss b/src/sass/components/menus.scss
index 6891318a..3ad4039a 100644
--- a/src/sass/components/menus.scss
+++ b/src/sass/components/menus.scss
@@ -35,7 +35,7 @@
         right: -3px;
         text-align: left;
         white-space: nowrap;
-        z-index: 1;
+        z-index: 3;
 
         > div {
             overflow: hidden;
-- 
cgit v1.2.3


From 3e57a87bf7809d4393e1d3fdf6df0c4ac66ea8c5 Mon Sep 17 00:00:00 2001
From: Daniel Sarin <daniel.sarin@gmail.com>
Date: Wed, 11 Apr 2018 15:39:23 +0300
Subject: Add i18n support for "Normal" value in speed options

---
 src/js/controls.js | 2 +-
 src/js/defaults.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/js/controls.js b/src/js/controls.js
index 879fd3fc..160c3665 100644
--- a/src/js/controls.js
+++ b/src/js/controls.js
@@ -511,7 +511,7 @@ const controls = {
     getLabel(setting, value) {
         switch (setting) {
             case 'speed':
-                return value === 1 ? 'Normal' : `${value}&times;`;
+                return value === 1 ? i18n.get('normal', this.config) : `${value}&times;`;
 
             case 'quality':
                 if (utils.is.number(value)) {
diff --git a/src/js/defaults.js b/src/js/defaults.js
index ddb7c2e4..9adf0eb2 100644
--- a/src/js/defaults.js
+++ b/src/js/defaults.js
@@ -177,6 +177,7 @@ const defaults = {
         captions: 'Captions',
         settings: 'Settings',
         speed: 'Speed',
+        normal: 'Normal',
         quality: 'Quality',
         loop: 'Loop',
         start: 'Start',
-- 
cgit v1.2.3


From 72155472dd2f0899f819fcd530def2a65707e940 Mon Sep 17 00:00:00 2001
From: Antonio Laguna <sombragriselros@gmail.com>
Date: Wed, 11 Apr 2018 15:39:12 +0200
Subject: Safer check for active caption

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

(limited to 'src')

diff --git a/src/js/plyr.js b/src/js/plyr.js
index 6be0d2cc..04a68d02 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -845,7 +845,7 @@ class Plyr {
         }
 
         // If the method is called without parameter, toggle based on current value
-        const show = utils.is.boolean(input) ? input : this.elements.container.className.indexOf(this.config.classNames.captions.active) === -1;
+        const show = utils.is.boolean(input) ? input : !this.elements.container.classList.contains(this.config.classNames.captions.active);
 
         // Nothing to change...
         if (this.captions.active === show) {
-- 
cgit v1.2.3