From 14f72baf162a9fba23cb648c3ac13e1620d3ac47 Mon Sep 17 00:00:00 2001 From: Mike Abrahall Date: Fri, 21 Feb 2020 16:08:23 +1100 Subject: [PATCH 1/7] Added extra playback keybindings, following YouTube's spec at https://support.google.com/youtube/answer/7631406?hl=en --- src/controllers/playback/videoosd.js | 43 ++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/videoosd.js index 27652958d0..3c3e88bf78 100644 --- a/src/controllers/playback/videoosd.js +++ b/src/controllers/playback/videoosd.js @@ -1119,6 +1119,14 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med playbackManager.playPause(currentPlayer); showOsd(); break; + case "ArrowUp": + case "Up": + playbackManager.volumeUp(currentPlayer); + break; + case "ArrowDown": + case "Down": + playbackManager.volumeDown(currentPlayer); + break; case "l": case "ArrowRight": case "Right": @@ -1141,6 +1149,18 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med playbackManager.toggleMute(currentPlayer); showOsd(); break; + case "p": + case "P": + if (e.shiftKey) { + playbackManager.previousTrack(currentPlayer); + } + break; + case "n": + case "N": + if (e.shiftKey) { + playbackManager.nextTrack(currentPlayer); + } + break; case "NavigationLeft": case "GamepadDPadLeft": case "GamepadLeftThumbstickLeft": @@ -1158,6 +1178,29 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med playbackManager.fastForward(currentPlayer); showOsd(); } + // + case "Home": + playbackManager.seekPercent(0, currentPlayer); + break; + case "End": + // Honestly this binding seems kind of pointless, just use 'nextTrack', + // but YouTube has this one and that's the standard I'm aiming for + playbackManager.seekPercent(100, currentPlayer); + break; + case "0": + case "1": + case "2": + case "3": + case "4": + case "5": + case "6": + case "7": + case "8": + case "9": + var percent = parseInt(key); + percent *= 10; + playbackManager.seekPercent(percent, currentPlayer); + break; } } From 7a0178cae6ede4053e9e3dca4ef6cd4cebf04c96 Mon Sep 17 00:00:00 2001 From: ferferga Date: Sun, 26 Apr 2020 14:54:40 +0200 Subject: [PATCH 2/7] Change menu icon to vertical one --- src/components/apphost.js | 2 +- src/components/cardbuilder/cardBuilder.js | 6 +++--- src/components/guide/tvguide.template.html | 2 +- src/components/metadataeditor/metadataeditor.template.html | 2 +- src/controllers/dashboard/plugins/installed.js | 2 +- src/controllers/devices.js | 2 +- src/controllers/livetvstatus.js | 4 ++-- src/controllers/medialibrarypage.js | 2 +- src/controllers/userprofilespage.js | 4 ++-- src/list.html | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/apphost.js b/src/components/apphost.js index 6d7e857c32..3cb18dc7a2 100644 --- a/src/components/apphost.js +++ b/src/components/apphost.js @@ -370,7 +370,7 @@ define(["appSettings", "browser", "events", "htmlMediaHelper", "webSettings"], f return -1 !== supportedFeatures.indexOf(command.toLowerCase()); }, preferVisualCards: browser.android || browser.chrome, - moreIcon: browser.android ? "more_vert" : "more_horiz", + moreIcon: browser.android ? "more_vert" : "more_vert", getSyncProfile: getSyncProfile, getDefaultLayout: function () { if (window.NativeShell) { diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index a4cf6edadc..f875e8e802 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -869,7 +869,7 @@ import 'programStyles'; if (isOuterFooter && options.cardLayout && layoutManager.mobile) { if (options.cardFooterAside !== 'none') { - html += ''; + html += ''; } } @@ -1426,7 +1426,7 @@ import 'programStyles'; } if (options.overlayMoreButton) { - overlayButtons += ''; + overlayButtons += ''; } } @@ -1580,7 +1580,7 @@ import 'programStyles'; html += ''; } - html += ''; + html += ''; html += ''; html += ''; diff --git a/src/components/guide/tvguide.template.html b/src/components/guide/tvguide.template.html index ef3c4b58ca..1babf5aac4 100644 --- a/src/components/guide/tvguide.template.html +++ b/src/components/guide/tvguide.template.html @@ -10,7 +10,7 @@
diff --git a/src/components/metadataeditor/metadataeditor.template.html b/src/components/metadataeditor/metadataeditor.template.html index 8e36a824b7..246757768c 100644 --- a/src/components/metadataeditor/metadataeditor.template.html +++ b/src/components/metadataeditor/metadataeditor.template.html @@ -9,7 +9,7 @@ ${Save}
diff --git a/src/controllers/dashboard/plugins/installed.js b/src/controllers/dashboard/plugins/installed.js index c381b2409e..d87413bb59 100644 --- a/src/controllers/dashboard/plugins/installed.js +++ b/src/controllers/dashboard/plugins/installed.js @@ -54,7 +54,7 @@ define(["loading", "libraryMenu", "dom", "globalize", "cardStyle", "emby-button" html += ""; html += '
'; html += '
'; - html += ''; + html += ''; html += "
"; html += "
"; html += configPage ? configPage.DisplayName || plugin.Name : plugin.Name; diff --git a/src/controllers/devices.js b/src/controllers/devices.js index 8dd665f7fa..7401e17c00 100644 --- a/src/controllers/devices.js +++ b/src/controllers/devices.js @@ -89,7 +89,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "da if (canEdit || canDelete(device.Id)) { deviceHtml += '
'; - deviceHtml += ''; + deviceHtml += ''; deviceHtml += "
"; } diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js index aee5876a45..adc436070e 100644 --- a/src/controllers/livetvstatus.js +++ b/src/controllers/livetvstatus.js @@ -30,7 +30,7 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo html += "
"; html += "
"; html += '
'; - html += ''; + html += ''; html += '
' + (device.FriendlyName || getTunerName(device.Type)) + "
"; html += '
'; html += device.Url || " "; @@ -112,7 +112,7 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo html += "
"; html += ""; html += "
"; - html += ''; + html += ''; html += ""; } diff --git a/src/controllers/medialibrarypage.js b/src/controllers/medialibrarypage.js index d838c2145e..b94c8600f9 100644 --- a/src/controllers/medialibrarypage.js +++ b/src/controllers/medialibrarypage.js @@ -298,7 +298,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl if (virtualFolder.showMenu !== false) { html += '
'; - html += ''; + html += ''; html += "
"; } diff --git a/src/controllers/userprofilespage.js b/src/controllers/userprofilespage.js index 180d0e62ae..90609fa066 100644 --- a/src/controllers/userprofilespage.js +++ b/src/controllers/userprofilespage.js @@ -115,7 +115,7 @@ define(["loading", "dom", "globalize", "date-fns", "dfnshelper", "paper-icon-but html += '
'; html += user.Name; html += "
"; - html += ''; + html += ''; html += ""; html += '
'; var lastSeen = getLastSeenText(user.LastActivityDate); @@ -189,7 +189,7 @@ define(["loading", "dom", "globalize", "date-fns", "dfnshelper", "paper-icon-but html += "
"; html += '
'; html += '
'; - html += ''; + html += ''; html += "
"; html += '
'; html += user.UserName; diff --git a/src/list.html b/src/list.html index 375653c12d..48214df352 100644 --- a/src/list.html +++ b/src/list.html @@ -42,10 +42,10 @@
From 1b0a5e254385f83ef508aa88c6f52bacaff2beca Mon Sep 17 00:00:00 2001 From: ferferga Date: Wed, 29 Apr 2020 23:55:26 +0200 Subject: [PATCH 3/7] Replace horizontal icon using unicode and remove unnecessary statement in apphost --- src/components/apphost.js | 1 - src/components/listview/listview.js | 2 +- src/components/multiselect/multiselect.js | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/apphost.js b/src/components/apphost.js index 3cb18dc7a2..7c2c59a5ec 100644 --- a/src/components/apphost.js +++ b/src/components/apphost.js @@ -370,7 +370,6 @@ define(["appSettings", "browser", "events", "htmlMediaHelper", "webSettings"], f return -1 !== supportedFeatures.indexOf(command.toLowerCase()); }, preferVisualCards: browser.android || browser.chrome, - moreIcon: browser.android ? "more_vert" : "more_vert", getSyncProfile: getSyncProfile, getDefaultLayout: function () { if (window.NativeShell) { diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js index 532ba094a8..76fda7a0ce 100644 --- a/src/components/listview/listview.js +++ b/src/components/listview/listview.js @@ -426,7 +426,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan html += '
'; - var moreIcon = ''; + var moreIcon = ''; html += getTextLinesHtml(textlines, isLargeStyle); diff --git a/src/components/multiselect/multiselect.js b/src/components/multiselect/multiselect.js index b4fa87c8a0..8a41e86af7 100644 --- a/src/components/multiselect/multiselect.js +++ b/src/components/multiselect/multiselect.js @@ -129,7 +129,7 @@ define(["browser", "appStorage", "apphost", "loading", "connectionManager", "glo html += ''; html += '

'; - var moreIcon = ""; + var moreIcon = ''; html += ''; selectionCommandsPanel.innerHTML = html; From 8b71ebc35f40375037fb8b075d215cfdfaff08ba Mon Sep 17 00:00:00 2001 From: ferferga Date: Thu, 30 Apr 2020 00:05:44 +0200 Subject: [PATCH 4/7] more_vert in itemdetailpage.js --- src/controllers/itemdetailpage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js index e9242c5119..992b86e4ed 100644 --- a/src/controllers/itemdetailpage.js +++ b/src/controllers/itemdetailpage.js @@ -2078,7 +2078,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "userSetti bindAll(view, ".btnCancelTimer", "click", onCancelTimerClick); bindAll(view, ".btnDeleteItem", "click", onDeleteClick); bindAll(view, ".btnDownload", "click", onDownloadClick); - view.querySelector(".btnMoreCommands i").innerHTML = ""; + view.querySelector(".btnMoreCommands i").innerHTML = ""; view.querySelector(".trackSelections").addEventListener("submit", onTrackSelectionsSubmit); view.querySelector(".btnSplitVersions").addEventListener("click", function () { splitVersions(self, view, apiClient, params); From ea18f97e8b68ba8d7e6041dfe507912d94fd6485 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Mon, 4 May 2020 18:09:10 +0200 Subject: [PATCH 5/7] Fix change requests in videoOsd --- src/controllers/playback/videoosd.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/videoosd.js index 3c3e88bf78..b5bf250aab 100644 --- a/src/controllers/playback/videoosd.js +++ b/src/controllers/playback/videoosd.js @@ -1178,13 +1178,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med playbackManager.fastForward(currentPlayer); showOsd(); } - // case "Home": playbackManager.seekPercent(0, currentPlayer); break; case "End": - // Honestly this binding seems kind of pointless, just use 'nextTrack', - // but YouTube has this one and that's the standard I'm aiming for playbackManager.seekPercent(100, currentPlayer); break; case "0": @@ -1197,8 +1194,7 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med case "7": case "8": case "9": - var percent = parseInt(key); - percent *= 10; + var percent = parseInt(key, 10) * 10; playbackManager.seekPercent(percent, currentPlayer); break; } From adb8f4114ba216b9665a3de4011cc226fcf02079 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Mon, 4 May 2020 18:13:34 +0200 Subject: [PATCH 6/7] Add missing break in videoOsd --- src/controllers/playback/videoosd.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/videoosd.js index b5bf250aab..05fbac7bb6 100644 --- a/src/controllers/playback/videoosd.js +++ b/src/controllers/playback/videoosd.js @@ -1178,6 +1178,7 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med playbackManager.fastForward(currentPlayer); showOsd(); } + break; case "Home": playbackManager.seekPercent(0, currentPlayer); break; From 6a596bd4973f7d0ebe8a1c2ae8d1081dca0776a6 Mon Sep 17 00:00:00 2001 From: ferferga Date: Sat, 16 May 2020 18:07:32 +0200 Subject: [PATCH 7/7] Fix merge conflicts --- src/components/apphost.js | 1 - src/components/cardbuilder/cardBuilder.js | 6 +++--- src/components/guide/tvguide.template.html | 2 +- src/components/listview/listview.js | 2 +- src/components/metadataeditor/metadataeditor.template.html | 2 +- src/components/multiselect/multiselect.js | 2 +- src/controllers/livetvstatus.js | 4 ++-- src/controllers/userprofilespage.js | 2 +- src/itemdetails.html | 2 +- src/list.html | 4 ++-- 10 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/components/apphost.js b/src/components/apphost.js index 75e8ba17f1..7b044d5d35 100644 --- a/src/components/apphost.js +++ b/src/components/apphost.js @@ -359,7 +359,6 @@ define(['appSettings', 'browser', 'events', 'htmlMediaHelper', 'webSettings', 'g return -1 !== supportedFeatures.indexOf(command.toLowerCase()); }, preferVisualCards: browser.android || browser.chrome, - moreIcon: browser.android ? 'more_vert' : 'more_horiz', getSyncProfile: getSyncProfile, getDefaultLayout: function () { if (window.NativeShell) { diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 43ca28f01d..d4d4d7f73b 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -869,7 +869,7 @@ import 'programStyles'; if (isOuterFooter && options.cardLayout && layoutManager.mobile) { if (options.cardFooterAside !== 'none') { - html += ''; + html += ''; } } @@ -1426,7 +1426,7 @@ import 'programStyles'; } if (options.overlayMoreButton) { - overlayButtons += ''; + overlayButtons += ''; } } @@ -1580,7 +1580,7 @@ import 'programStyles'; html += ''; } - html += ''; + html += ''; html += '
'; html += '
'; diff --git a/src/components/guide/tvguide.template.html b/src/components/guide/tvguide.template.html index 367aac6c17..730de55909 100644 --- a/src/components/guide/tvguide.template.html +++ b/src/components/guide/tvguide.template.html @@ -10,7 +10,7 @@
diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js index 0743b35280..587355b351 100644 --- a/src/components/listview/listview.js +++ b/src/components/listview/listview.js @@ -426,7 +426,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan html += '
'; - const moreIcon = 'more_horiz'; + const moreIcon = 'more_vert'; html += getTextLinesHtml(textlines, isLargeStyle); diff --git a/src/components/metadataeditor/metadataeditor.template.html b/src/components/metadataeditor/metadataeditor.template.html index 39894d4f6f..7845824281 100644 --- a/src/components/metadataeditor/metadataeditor.template.html +++ b/src/components/metadataeditor/metadataeditor.template.html @@ -9,7 +9,7 @@ ${Save}
diff --git a/src/components/multiselect/multiselect.js b/src/components/multiselect/multiselect.js index 70a0924bc1..6a22e5509f 100644 --- a/src/components/multiselect/multiselect.js +++ b/src/components/multiselect/multiselect.js @@ -129,7 +129,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo html += ''; html += '

'; - const moreIcon = 'more_horiz'; + const moreIcon = 'more_vert'; html += ''; selectionCommandsPanel.innerHTML = html; diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js index 053e5d3d4c..737d494963 100644 --- a/src/controllers/livetvstatus.js +++ b/src/controllers/livetvstatus.js @@ -30,7 +30,7 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo html += '
'; html += ''; html += '
'; - html += ''; + html += ''; html += '
' + (device.FriendlyName || getTunerName(device.Type)) + '
'; html += '
'; html += device.Url || ' '; @@ -112,7 +112,7 @@ define(['jQuery', 'globalize', 'scripts/taskbutton', 'dom', 'libraryMenu', 'layo html += '
'; html += ''; html += '
'; - html += ''; + html += ''; html += ''; } diff --git a/src/controllers/userprofilespage.js b/src/controllers/userprofilespage.js index 6afda79c7c..c691c665f6 100644 --- a/src/controllers/userprofilespage.js +++ b/src/controllers/userprofilespage.js @@ -189,7 +189,7 @@ define(['loading', 'dom', 'globalize', 'date-fns', 'dfnshelper', 'paper-icon-but html += ''; html += '
'; html += '
'; - html += ''; + html += ''; html += '
'; html += '
'; html += user.UserName; diff --git a/src/itemdetails.html b/src/itemdetails.html index 37f1432e23..4d5cab026f 100644 --- a/src/itemdetails.html +++ b/src/itemdetails.html @@ -101,7 +101,7 @@ diff --git a/src/list.html b/src/list.html index efac2d891e..464cd15530 100644 --- a/src/list.html +++ b/src/list.html @@ -42,10 +42,10 @@