From 5453881ea1f770f09a06013ea44f24a5456b2326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Wed, 20 Nov 2019 14:29:10 +0100 Subject: [PATCH 01/12] Send text and messages via remote control The needed logic to show/hide the section where needed is already there: https://github.com/jellyfin/jellyfin-web/blob/3419230e891f79128b26db1cad8f307addd3c05e/src/components/remotecontrol/remotecontrol.js#L206 --- src/nowplaying.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nowplaying.html b/src/nowplaying.html index fa8ade166..575725cd6 100644 --- a/src/nowplaying.html +++ b/src/nowplaying.html @@ -124,7 +124,7 @@ -
+

${HeaderSendMessage}

@@ -173,4 +173,4 @@

-
\ No newline at end of file +
From f1cce1ad7689d7f5972e0791797d1dd3e7f737e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Wed, 20 Nov 2019 14:46:03 +0100 Subject: [PATCH 02/12] Hides message section during local playback of music --- src/components/playback/playbackmanager.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js index 13497e191..404f5f464 100644 --- a/src/components/playback/playbackmanager.js +++ b/src/components/playback/playbackmanager.js @@ -3860,7 +3860,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla "SetMaxStreamingBitrate", "DisplayContent", "GoToSearch", - "DisplayMessage", "SetRepeatMode", "PlayMediaSource", "PlayTrailers" From e05e635b44663a32c0ffda8d8bc499d23d629d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Wed, 20 Nov 2019 18:01:58 +0100 Subject: [PATCH 03/12] Show/Hide Buttons --- src/components/remotecontrol/remotecontrol.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js index e586a1e12..f361c05b6 100644 --- a/src/components/remotecontrol/remotecontrol.js +++ b/src/components/remotecontrol/remotecontrol.js @@ -215,6 +215,17 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL context.querySelector(".sendTextSection").classList.add("hide"); } + buttonVisible(context.querySelector(".btnArrowUp"), -1 != supportedCommands.indexOf("MoveUp")); + buttonVisible(context.querySelector(".btnArrowLeft"), -1 != supportedCommands.indexOf("MoveDown")); + buttonVisible(context.querySelector(".btnArrowRight"), -1 != supportedCommands.indexOf("MoveRight")); + buttonVisible(context.querySelector(".btnArrowDown"), -1 != supportedCommands.indexOf("MoveLeft")); + buttonVisible(context.querySelector(".btnOk"), -1 != supportedCommands.indexOf("Select")); + buttonVisible(context.querySelector(".btnBack"), -1 != supportedCommands.indexOf("Back")); + buttonVisible(context.querySelector(".btnInfo"), -1 != supportedCommands.indexOf("ToggleOsd")); + buttonVisible(context.querySelector(".btnShowSearch"), -1 != supportedCommands.indexOf("GoToSearch")); + buttonVisible(context.querySelector(".bthShowSettings"), -1 != supportedCommands.indexOf("GoToSettings")); + buttonVisible(context.querySelector(".btnGoHome"), -1 != supportedCommands.indexOf("GoHome")); + buttonVisible(context.querySelector(".btnStop"), null != item); buttonVisible(context.querySelector(".btnNextTrack"), null != item); buttonVisible(context.querySelector(".btnPreviousTrack"), null != item); From 3a6275a05c69c506739313e102e4c7a21178a618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Wed, 20 Nov 2019 18:02:32 +0100 Subject: [PATCH 04/12] Center Buttons --- src/components/remotecontrol/remotecontrol.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css index 5d375d01d..0b6a2dbbc 100644 --- a/src/components/remotecontrol/remotecontrol.css +++ b/src/components/remotecontrol/remotecontrol.css @@ -8,6 +8,10 @@ flex-direction: row } +.navigationSection { + text-align: center +} + .nowPlayingPageTitle { margin: 0 0 .5em .5em } From 16feba6dff976d251f8f6ba763733657202ef52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Wed, 20 Nov 2019 18:03:55 +0100 Subject: [PATCH 05/12] Move Button --- src/nowplaying.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/nowplaying.html b/src/nowplaying.html index 575725cd6..e931916b4 100644 --- a/src/nowplaying.html +++ b/src/nowplaying.html @@ -75,7 +75,7 @@
-
+
-
-
From f7fd716f5040971713b219d813501a140ecf77e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Wed, 20 Nov 2019 18:06:15 +0100 Subject: [PATCH 06/12] Collaps sections --- src/nowplaying.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/nowplaying.html b/src/nowplaying.html index e931916b4..e41dab60c 100644 --- a/src/nowplaying.html +++ b/src/nowplaying.html @@ -124,8 +124,8 @@
-

${HeaderSendMessage}

-
+
+
@@ -139,10 +139,11 @@

+
-

${HeaderTypeText}

-
+
+
@@ -152,6 +153,7 @@

+
From d74939f7546a24b72cc0a5c1f82e8631bc1e5362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Thu, 21 Nov 2019 10:57:55 +0100 Subject: [PATCH 07/12] Update Layout --- src/nowplaying.html | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/nowplaying.html b/src/nowplaying.html index e41dab60c..2e3286511 100644 --- a/src/nowplaying.html +++ b/src/nowplaying.html @@ -74,38 +74,35 @@
-
+
-
+
- - - - -
-
- -
+
+ -

@@ -113,7 +110,6 @@ - From 21b942cf391105374b40071cab682b7ea8af728a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Thu, 21 Nov 2019 11:11:27 +0100 Subject: [PATCH 08/12] Rename Button --- src/nowplaying.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nowplaying.html b/src/nowplaying.html index 2e3286511..9da8f90ad 100644 --- a/src/nowplaying.html +++ b/src/nowplaying.html @@ -101,7 +101,7 @@ -
From 1690ffb86dbd5bb81be3b2b17b5abf9dfdb9fd81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Thu, 21 Nov 2019 11:13:21 +0100 Subject: [PATCH 09/12] rename button --- src/components/remotecontrol/remotecontrol.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js index f361c05b6..0613c5286 100644 --- a/src/components/remotecontrol/remotecontrol.js +++ b/src/components/remotecontrol/remotecontrol.js @@ -215,16 +215,16 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL context.querySelector(".sendTextSection").classList.add("hide"); } - buttonVisible(context.querySelector(".btnArrowUp"), -1 != supportedCommands.indexOf("MoveUp")); - buttonVisible(context.querySelector(".btnArrowLeft"), -1 != supportedCommands.indexOf("MoveDown")); - buttonVisible(context.querySelector(".btnArrowRight"), -1 != supportedCommands.indexOf("MoveRight")); - buttonVisible(context.querySelector(".btnArrowDown"), -1 != supportedCommands.indexOf("MoveLeft")); - buttonVisible(context.querySelector(".btnOk"), -1 != supportedCommands.indexOf("Select")); - buttonVisible(context.querySelector(".btnBack"), -1 != supportedCommands.indexOf("Back")); - buttonVisible(context.querySelector(".btnInfo"), -1 != supportedCommands.indexOf("ToggleOsd")); - buttonVisible(context.querySelector(".btnShowSearch"), -1 != supportedCommands.indexOf("GoToSearch")); - buttonVisible(context.querySelector(".bthShowSettings"), -1 != supportedCommands.indexOf("GoToSettings")); - buttonVisible(context.querySelector(".btnGoHome"), -1 != supportedCommands.indexOf("GoHome")); + buttonVisible(context.querySelector(".btnArrowUp"), -1 != supportedCommands.indexOf("MoveUp")); + buttonVisible(context.querySelector(".btnArrowLeft"), -1 != supportedCommands.indexOf("MoveDown")); + buttonVisible(context.querySelector(".btnArrowRight"), -1 != supportedCommands.indexOf("MoveRight")); + buttonVisible(context.querySelector(".btnArrowDown"), -1 != supportedCommands.indexOf("MoveLeft")); + buttonVisible(context.querySelector(".btnOk"), -1 != supportedCommands.indexOf("Select")); + buttonVisible(context.querySelector(".btnBack"), -1 != supportedCommands.indexOf("Back")); + buttonVisible(context.querySelector(".btnContextMenu"), -1 != supportedCommands.indexOf("ToggleContextMenu")); + buttonVisible(context.querySelector(".btnShowSearch"), -1 != supportedCommands.indexOf("GoToSearch")); + buttonVisible(context.querySelector(".bthShowSettings"), -1 != supportedCommands.indexOf("GoToSettings")); + buttonVisible(context.querySelector(".btnGoHome"), -1 != supportedCommands.indexOf("GoHome")); buttonVisible(context.querySelector(".btnStop"), null != item); buttonVisible(context.querySelector(".btnNextTrack"), null != item); From 347a0e19105d438ff28643ec221e331bf9719e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Fri, 22 Nov 2019 15:59:48 +0100 Subject: [PATCH 10/12] add feature back --- src/components/playback/playbackmanager.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js index 404f5f464..13497e191 100644 --- a/src/components/playback/playbackmanager.js +++ b/src/components/playback/playbackmanager.js @@ -3860,6 +3860,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla "SetMaxStreamingBitrate", "DisplayContent", "GoToSearch", + "DisplayMessage", "SetRepeatMode", "PlayMediaSource", "PlayTrailers" From 092a8fd3e091cd741cb7094d051f25a0e02efe2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Fri, 22 Nov 2019 16:01:25 +0100 Subject: [PATCH 11/12] hide during local playback --- src/components/remotecontrol/remotecontrol.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js index 0613c5286..a30a79110 100644 --- a/src/components/remotecontrol/remotecontrol.js +++ b/src/components/remotecontrol/remotecontrol.js @@ -203,18 +203,24 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL updateAudioTracksDisplay(player, context); updateSubtitleTracksDisplay(player, context); - if (-1 != supportedCommands.indexOf("DisplayMessage")) { + if (-1 != supportedCommands.indexOf("DisplayMessage") && !currentPlayer.isLocalPlayer) { context.querySelector(".sendMessageSection").classList.remove("hide"); } else { context.querySelector(".sendMessageSection").classList.add("hide"); } - if (-1 != supportedCommands.indexOf("SendString")) { + if (-1 != supportedCommands.indexOf("SendString") && !currentPlayer.isLocalPlayer) { context.querySelector(".sendTextSection").classList.remove("hide"); } else { context.querySelector(".sendTextSection").classList.add("hide"); } + if (!currentPlayer.isLocalPlayer) { + context.querySelector(".navigationSection").classList.remove("hide"); + } else { + context.querySelector(".navigationSection").classList.add("hide"); + } + buttonVisible(context.querySelector(".btnArrowUp"), -1 != supportedCommands.indexOf("MoveUp")); buttonVisible(context.querySelector(".btnArrowLeft"), -1 != supportedCommands.indexOf("MoveDown")); buttonVisible(context.querySelector(".btnArrowRight"), -1 != supportedCommands.indexOf("MoveRight")); From e3fbfbeeff005030cd1a51134362f19b25a3331e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20F=C3=A4th?= Date: Wed, 4 Dec 2019 17:50:16 +0100 Subject: [PATCH 12/12] Update src/nowplaying.html Co-Authored-By: dkanada --- src/nowplaying.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nowplaying.html b/src/nowplaying.html index 9da8f90ad..fdb6fc229 100644 --- a/src/nowplaying.html +++ b/src/nowplaying.html @@ -81,7 +81,7 @@ keyboard_arrow_up
-
+