From e600943ab10569dc7c40d6f91d44c33b22b91333 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sat, 25 Apr 2020 11:31:22 +0300
Subject: [PATCH 1/4] Fix event subscription

---
 src/components/remotecontrol/remotecontrol.js | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 8e2a382d1d..459af495b3 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -593,6 +593,18 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
         }
 
         function bindEvents(context) {
+            var contextmenuHtml = '<button id="toggleContextMenu" is="paper-icon-button-light" class="btnToggleContextMenu" title=' + globalize.translate('ButtonToggleContextMenu') + '><i class="material-icons more_vert"></i></button>';
+            var volumecontrolHtml = '<div class="volumecontrol flex align-items-center flex-wrap-wrap justify-content-center">';
+            volumecontrolHtml += '<button is="paper-icon-button-light" class="buttonMute autoSize" title=' + globalize.translate('Mute') + '><i class="xlargePaperIconButton material-icons"></i></button>';
+            volumecontrolHtml += '<div class="sliderContainer nowPlayingVolumeSliderContainer"><input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="nowPlayingVolumeSlider"/></div>';
+            volumecontrolHtml += '</div>';
+            if (!layoutManager.mobile) {
+                context.querySelector(".nowPlayingSecondaryButtons").innerHTML += volumecontrolHtml;
+                context.querySelector(".playlistSectionButton").innerHTML += contextmenuHtml;
+            } else {
+                context.querySelector(".playlistSectionButton").innerHTML += volumecontrolHtml + contextmenuHtml;
+            }
+
             var btnCommand = context.querySelectorAll(".btnCommand");
 
             for (var i = 0, length = btnCommand.length; i < length; i++) {
@@ -672,18 +684,6 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
                 playbackManager.setVolume(this.value, currentPlayer);
             }
 
-            var contextmenuHtml = '<button id="toggleContextMenu" is="paper-icon-button-light" class="btnToggleContextMenu" title=' + globalize.translate('ButtonToggleContextMenu') + '><i class="material-icons more_vert"></i></button>';
-            var volumecontrolHtml = '<div class="volumecontrol flex align-items-center flex-wrap-wrap justify-content-center">';
-            volumecontrolHtml += '<button is="paper-icon-button-light" class="buttonMute autoSize" title=' + globalize.translate('Mute') + '><i class="xlargePaperIconButton material-icons"></i></button>';
-            volumecontrolHtml += '<div class="sliderContainer nowPlayingVolumeSliderContainer"><input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="nowPlayingVolumeSlider"/></div>';
-            volumecontrolHtml += '</div>';
-            if (!layoutManager.mobile) {
-                context.querySelector(".nowPlayingSecondaryButtons").innerHTML += volumecontrolHtml;
-                context.querySelector(".playlistSectionButton").innerHTML += contextmenuHtml;
-            } else {
-                context.querySelector(".playlistSectionButton").innerHTML += volumecontrolHtml + contextmenuHtml;
-            }
-
             context.querySelector(".nowPlayingVolumeSlider").addEventListener("change", setVolume);
             context.querySelector(".nowPlayingVolumeSlider").addEventListener("mousemove", setVolume);
             context.querySelector(".nowPlayingVolumeSlider").addEventListener("touchmove", setVolume);

From 1f3620e219b7635537d597219034039f85fcf5c6 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Tue, 28 Apr 2020 15:57:34 +0300
Subject: [PATCH 2/4] Move HTML generation to more appropriate place

---
 src/components/remotecontrol/remotecontrol.js | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 459af495b3..a3d76c4db7 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -593,18 +593,6 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
         }
 
         function bindEvents(context) {
-            var contextmenuHtml = '<button id="toggleContextMenu" is="paper-icon-button-light" class="btnToggleContextMenu" title=' + globalize.translate('ButtonToggleContextMenu') + '><i class="material-icons more_vert"></i></button>';
-            var volumecontrolHtml = '<div class="volumecontrol flex align-items-center flex-wrap-wrap justify-content-center">';
-            volumecontrolHtml += '<button is="paper-icon-button-light" class="buttonMute autoSize" title=' + globalize.translate('Mute') + '><i class="xlargePaperIconButton material-icons"></i></button>';
-            volumecontrolHtml += '<div class="sliderContainer nowPlayingVolumeSliderContainer"><input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="nowPlayingVolumeSlider"/></div>';
-            volumecontrolHtml += '</div>';
-            if (!layoutManager.mobile) {
-                context.querySelector(".nowPlayingSecondaryButtons").innerHTML += volumecontrolHtml;
-                context.querySelector(".playlistSectionButton").innerHTML += contextmenuHtml;
-            } else {
-                context.querySelector(".playlistSectionButton").innerHTML += volumecontrolHtml + contextmenuHtml;
-            }
-
             var btnCommand = context.querySelectorAll(".btnCommand");
 
             for (var i = 0, length = btnCommand.length; i < length; i++) {
@@ -767,6 +755,18 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
         }
 
         function init(ownerView, context) {
+            var contextmenuHtml = '<button id="toggleContextMenu" is="paper-icon-button-light" class="btnToggleContextMenu" title=' + globalize.translate('ButtonToggleContextMenu') + '><i class="material-icons more_vert"></i></button>';
+            var volumecontrolHtml = '<div class="volumecontrol flex align-items-center flex-wrap-wrap justify-content-center">';
+            volumecontrolHtml += '<button is="paper-icon-button-light" class="buttonMute autoSize" title=' + globalize.translate('Mute') + '><i class="xlargePaperIconButton material-icons"></i></button>';
+            volumecontrolHtml += '<div class="sliderContainer nowPlayingVolumeSliderContainer"><input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="nowPlayingVolumeSlider"/></div>';
+            volumecontrolHtml += '</div>';
+            if (!layoutManager.mobile) {
+                context.querySelector(".nowPlayingSecondaryButtons").innerHTML += volumecontrolHtml;
+                context.querySelector(".playlistSectionButton").innerHTML += contextmenuHtml;
+            } else {
+                context.querySelector(".playlistSectionButton").innerHTML += volumecontrolHtml + contextmenuHtml;
+            }
+
             bindEvents(context);
             context.querySelector(".sendMessageForm").addEventListener("submit", onMessageSubmit);
             context.querySelector(".typeTextForm").addEventListener("submit", onSendStringSubmit);

From 4609e22520e99448124e11bb7561149d20b0f9e1 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Tue, 28 Apr 2020 16:09:40 +0300
Subject: [PATCH 3/4] Update style

---
 src/components/remotecontrol/remotecontrol.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index a3d76c4db7..327cd1dcf3 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -755,16 +755,16 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
         }
 
         function init(ownerView, context) {
-            var contextmenuHtml = '<button id="toggleContextMenu" is="paper-icon-button-light" class="btnToggleContextMenu" title=' + globalize.translate('ButtonToggleContextMenu') + '><i class="material-icons more_vert"></i></button>';
-            var volumecontrolHtml = '<div class="volumecontrol flex align-items-center flex-wrap-wrap justify-content-center">';
-            volumecontrolHtml += '<button is="paper-icon-button-light" class="buttonMute autoSize" title=' + globalize.translate('Mute') + '><i class="xlargePaperIconButton material-icons"></i></button>';
+            let contextmenuHtml = `<button id="toggleContextMenu" is="paper-icon-button-light" class="btnToggleContextMenu" title=${globalize.translate('ButtonToggleContextMenu')}><i class="material-icons more_vert"></i></button>`;
+            let volumecontrolHtml = '<div class="volumecontrol flex align-items-center flex-wrap-wrap justify-content-center">';
+            volumecontrolHtml += `<button is="paper-icon-button-light" class="buttonMute autoSize" title=${globalize.translate('Mute')}><i class="xlargePaperIconButton material-icons"></i></button>`;
             volumecontrolHtml += '<div class="sliderContainer nowPlayingVolumeSliderContainer"><input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="nowPlayingVolumeSlider"/></div>';
             volumecontrolHtml += '</div>';
             if (!layoutManager.mobile) {
-                context.querySelector(".nowPlayingSecondaryButtons").innerHTML += volumecontrolHtml;
-                context.querySelector(".playlistSectionButton").innerHTML += contextmenuHtml;
+                context.querySelector('.nowPlayingSecondaryButtons').innerHTML += volumecontrolHtml;
+                context.querySelector('.playlistSectionButton').innerHTML += contextmenuHtml;
             } else {
-                context.querySelector(".playlistSectionButton").innerHTML += volumecontrolHtml + contextmenuHtml;
+                context.querySelector('.playlistSectionButton').innerHTML += volumecontrolHtml + contextmenuHtml;
             }
 
             bindEvents(context);

From 4e735ec130ea27dde0d8d77efdda9ac32cf1322b Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Tue, 28 Apr 2020 16:42:17 +0300
Subject: [PATCH 4/4] Add strings to translate

---
 src/strings/en-us.json | 2 ++
 src/strings/ru.json    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index a44dece13b..344753c74f 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -137,6 +137,8 @@
     "ButtonSplit": "Split",
     "ButtonSubmit": "Submit",
     "ButtonSubtitles": "Subtitles",
+    "ButtonToggleContextMenu": "More",
+    "ButtonTogglePlaylist": "Playlist",
     "ButtonTrailer": "Trailer",
     "ButtonUninstall": "Uninstall",
     "ButtonUp": "Up",
diff --git a/src/strings/ru.json b/src/strings/ru.json
index 7a6c508bd7..40bad74a0e 100644
--- a/src/strings/ru.json
+++ b/src/strings/ru.json
@@ -127,6 +127,8 @@
     "ButtonStop": "Остановить",
     "ButtonSubmit": "Подтвердить",
     "ButtonSubtitles": "Субтитры",
+    "ButtonToggleContextMenu": "Ещё",
+    "ButtonTogglePlaylist": "Плей-лист",
     "ButtonTrailer": "Трейлер",
     "ButtonUninstall": "Удалить",
     "ButtonUp": "Вверх",