From 0eb393dc4bebc18ad9ae72c43a8eb5aa7e58231f Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sun, 22 Jan 2023 14:08:05 -0500 Subject: [PATCH] Backport pull request #4274 from jellyfin/release-10.8.z Fix back action on Hisense TV Original-merge: 0ff86d9ea026ece61ab07846e99ff4d23b235405 Merged-by: Joshua M. Boniface Backported-by: Joshua M. Boniface --- src/scripts/browser.js | 2 ++ src/scripts/keyboardNavigation.js | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/scripts/browser.js b/src/scripts/browser.js index fe0601fc97..2a28130150 100644 --- a/src/scripts/browser.js +++ b/src/scripts/browser.js @@ -282,7 +282,9 @@ if (userAgent.toLowerCase().indexOf('xbox') !== -1) { browser.tv = true; } browser.animate = typeof document !== 'undefined' && document.documentElement.animate != null; +browser.hisense = userAgent.toLowerCase().includes('hisense'); browser.tizen = userAgent.toLowerCase().indexOf('tizen') !== -1 || window.tizen != null; +browser.vidaa = userAgent.toLowerCase().includes('vidaa'); browser.web0s = isWeb0s(); browser.edgeUwp = browser.edge && (userAgent.toLowerCase().indexOf('msapphost') !== -1 || userAgent.toLowerCase().indexOf('webview') !== -1); diff --git a/src/scripts/keyboardNavigation.js b/src/scripts/keyboardNavigation.js index 3ec0299cc9..feef180630 100644 --- a/src/scripts/keyboardNavigation.js +++ b/src/scripts/keyboardNavigation.js @@ -3,6 +3,7 @@ * @module components/input/keyboardnavigation */ +import browser from './browser'; import inputManager from './inputManager'; import layoutManager from '../components/layoutManager'; import appSettings from './settings/appSettings'; @@ -120,6 +121,15 @@ export function enable() { inputManager.handleCommand('back'); break; + // HACK: Hisense TV (VIDAA OS) uses Backspace for Back action + case 'Backspace': + if (browser.tv && browser.hisense && browser.vidaa) { + inputManager.handleCommand('back'); + } else { + capture = false; + } + break; + case 'Escape': if (layoutManager.tv) { inputManager.handleCommand('back');