mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #584 from Nickbert7/patch-1

Browse source 
Enable remote control navigation
This commit is contained in:
dkanada 2019-12-05 02:02:28 +09:00 • committed by GitHub
commit 9599273f00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/remotecontrol/remotecontrol.css
View file

@ -8,6 +8,10 @@
flex-direction: row flex-direction: row
} }
.navigationSection {
text-align: center
}
.nowPlayingPageTitle { .nowPlayingPageTitle {
margin: 0 0 .5em .5em margin: 0 0 .5em .5em
} }

21
src/components/remotecontrol/remotecontrol.js
View file

@ -203,18 +203,35 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
updateAudioTracksDisplay(player, context); updateAudioTracksDisplay(player, context);
updateSubtitleTracksDisplay(player, context); updateSubtitleTracksDisplay(player, context);
if (-1 != supportedCommands.indexOf("DisplayMessage")) { if (-1 != supportedCommands.indexOf("DisplayMessage") && !currentPlayer.isLocalPlayer) {
context.querySelector(".sendMessageSection").classList.remove("hide"); context.querySelector(".sendMessageSection").classList.remove("hide");
} else { } else {
context.querySelector(".sendMessageSection").classList.add("hide"); context.querySelector(".sendMessageSection").classList.add("hide");
} }
if (-1 != supportedCommands.indexOf("SendString")) { if (-1 != supportedCommands.indexOf("SendString") && !currentPlayer.isLocalPlayer) {
context.querySelector(".sendTextSection").classList.remove("hide"); context.querySelector(".sendTextSection").classList.remove("hide");
} else { } else {
context.querySelector(".sendTextSection").classList.add("hide"); 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"));
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(".btnStop"), null != item);
buttonVisible(context.querySelector(".btnNextTrack"), null != item); buttonVisible(context.querySelector(".btnNextTrack"), null != item);
buttonVisible(context.querySelector(".btnPreviousTrack"), null != item); buttonVisible(context.querySelector(".btnPreviousTrack"), null != item);

46
src/nowplaying.html
View file

@ -74,38 +74,35 @@
</div> </div>
</div> </div>
</div> </div>
<div class="navigationSection">
<div class="hide"> <br />
<div> <div>
<button is="paper-icon-button-light" class="btnArrowUp btnCommand autoSize" title="${ButtonArrowUp}" data-command="MoveUp"> <button is="paper-icon-button-light" class="btnArrowUp btnCommand autoSize raised" title="${ButtonArrowUp}" data-command="MoveUp">
<i class="md-icon">keyboard_arrow_up</i> <i class="md-icon">keyboard_arrow_up</i>
</button> </button>
</div> </div>
<br />
<div> <div>
<button is="paper-icon-button-light" class="btnArrowLeft btnCommand autoSize" title="${ButtonArrowLeft}" data-command="MoveLeft"> <button is="paper-icon-button-light" class="btnArrowLeft btnCommand autoSize raised" title="${ButtonArrowLeft}" data-command="MoveLeft">
<i class="md-icon">keyboard_arrow_left</i> <i class="md-icon">keyboard_arrow_left</i>
</button> </button>
<button is="paper-icon-button-light" class="btnOk btnCommand autoSize raised" title="${ButtonOk}" data-command="Select">
<button is="paper-icon-button-light" class="btnOk btnCommand autoSize" title="${ButtonOk}" data-command="Select"> <i class="md-icon">keyboard_return</i>
<i class="md-icon">check</i>
</button> </button>
<button is="paper-icon-button-light" class="btnArrowRight btnCommand autoSize raised" title="${ButtonArrowRight}" data-command="MoveRight">
<button is="paper-icon-button-light" class="btnArrowRight btnCommand autoSize" title="${ButtonArrowRight}" data-command="MoveRight">
<i class="md-icon">keyboard_arrow_right</i> <i class="md-icon">keyboard_arrow_right</i>
</button> </button>
</div> </div>
<div> <br />
<button is="paper-icon-button-light" class="btnArrowDown btnCommand autoSize" title="${ButtonArrowDown}" data-command="MoveDown">
<i class="md-icon">keyboard_arrow_down</i>
</button>
</div>
<div> <div>
<button is="paper-icon-button-light" class="btnBack btnCommand autoSize" title="${ButtonBack}" data-command="Back"> <button is="paper-icon-button-light" class="btnBack btnCommand autoSize" title="${ButtonBack}" data-command="Back">
<i class="md-icon">arrow_back</i> <i class="md-icon">arrow_back</i>
</button> </button>
<button is="paper-icon-button-light" class="btnArrowDown btnCommand autoSize raised" title="${ButtonArrowDown}" data-command="MoveDown">
<button is="paper-icon-button-light" class="btnInfo btnCommand autoSize" title="${ButtonInfo}" data-command="ToggleContextMenu"> <i class="md-icon">keyboard_arrow_down</i>
<i class="md-icon">info</i> </button>
<button is="paper-icon-button-light" class="btnContextMenu btnCommand autoSize" title="${ButtonInfo}" data-command="ToggleContextMenu">
<i class="md-icon">menu</i>
</button> </button>
</div> </div>
<br /> <br />
@ -113,21 +110,18 @@
<button is="paper-icon-button-light" class="btnGoHome btnCommand autoSize" title="${ButtonHome}" data-command="GoHome"> <button is="paper-icon-button-light" class="btnGoHome btnCommand autoSize" title="${ButtonHome}" data-command="GoHome">
<i class="md-icon">home</i> <i class="md-icon">home</i>
</button> </button>
<button is="paper-icon-button-light" class="btnShowSearch btnCommand autoSize" title="${ButtonSearch}" data-command="GoToSearch"> <button is="paper-icon-button-light" class="btnShowSearch btnCommand autoSize" title="${ButtonSearch}" data-command="GoToSearch">
<i class="md-icon">search</i> <i class="md-icon">search</i>
</button> </button>
</div>
<div>
<button is="paper-icon-button-light" class="bthShowSettings btnCommand autoSize" title="${ButtonSettings}" data-command="GoToSettings"> <button is="paper-icon-button-light" class="bthShowSettings btnCommand autoSize" title="${ButtonSettings}" data-command="GoToSettings">
<i class="md-icon">settings</i> <i class="md-icon">settings</i>
</button> </button>
</div> </div>
</div> </div>
<div class="hide"> <div>
<div class="sendMessageSection"> <div class="sendMessageSection">
<br /><h2>${HeaderSendMessage}</h2> <div is="emby-collapse" title="${HeaderSendMessage}">
<div style="text-align: left;"> <div class="collapseContent" style="text-align: left;">
<form class="sendMessageForm"> <form class="sendMessageForm">
<div class="inputContainer"> <div class="inputContainer">
<input is="emby-input" class="sendMessageElement" type="text" id="txtMessageTitle" label="${LabelMessageTitle}" required /> <input is="emby-input" class="sendMessageElement" type="text" id="txtMessageTitle" label="${LabelMessageTitle}" required />
@ -141,10 +135,11 @@
</p> </p>
</form> </form>
</div> </div>
</div>
</div> </div>
<div class="sendTextSection"> <div class="sendTextSection">
<br /><h2>${HeaderTypeText}</h2> <div is="emby-collapse" title="${HeaderTypeText}">
<div style="text-align: left;"> <div class="collapseContent" style="text-align: left;">
<form class="typeTextForm"> <form class="typeTextForm">
<div class="inputContainer"> <div class="inputContainer">
<input is="emby-input" class="typeTextElement" type="text" id="txtTypeText" label="${LabelTypeText}" required /> <input is="emby-input" class="typeTextElement" type="text" id="txtTypeText" label="${LabelTypeText}" required />
@ -154,6 +149,7 @@
</p> </p>
</form> </form>
</div> </div>
</div>
</div> </div>
</div> </div>