diff --git a/dashboard-ui/bower_components/emby-webcomponents/voice/voiceprocessor.js b/dashboard-ui/bower_components/emby-webcomponents/voice/voiceprocessor.js index d618e813f4..d193937b92 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/voice/voiceprocessor.js +++ b/dashboard-ui/bower_components/emby-webcomponents/voice/voiceprocessor.js @@ -30,7 +30,7 @@ .then(function (result) { console.log("Result of executed command", result); if (result.item.actionid === 'show' && result.item.sourceid === 'group') { - return Promise.reject({ error: "group", item: result.item, groupName: result.name }); + return Promise.resolve({ error: "group", item: result.item, groupName: result.name }); } else { return Promise.resolve({ item: result.item }); } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index ed988c16f9..cd5d0a5a70 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -2073,6 +2073,22 @@ var AppInfo = {}; Dashboard.navigate('mypreferencesmenu.html?userId=' + ApiClient.getCurrentUserId()); }; + embyRouter.showGuide = function () { + Dashboard.navigate('livetv.html?tab=1'); + }; + + embyRouter.showLiveTV = function () { + Dashboard.navigate('livetv.html'); + }; + + embyRouter.showRecordedTV = function () { + Dashboard.navigate('livetv.html?tab=3'); + }; + + embyRouter.showFavorites = function () { + Dashboard.navigate('home.html?tab=3'); + }; + function showItem(item) { if (typeof (item) === 'string') { require(['connectionManager'], function (connectionManager) { diff --git a/dashboard-ui/scripts/wizardcomponents.js b/dashboard-ui/scripts/wizardcomponents.js index 875e92bc1c..2943a28dfa 100644 --- a/dashboard-ui/scripts/wizardcomponents.js +++ b/dashboard-ui/scripts/wizardcomponents.js @@ -18,7 +18,7 @@ view.querySelector('.fldSelectEncoderPathType').classList.remove('hide'); } - if (systemInfo.OperatingSystem == 'Windows' && systemInfo.SystemArchitecture != 'Arm') { + /*if (systemInfo.OperatingSystem == 'Windows' && systemInfo.SystemArchitecture != 'Arm') { view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', 'https://ffmpeg.zeranoe.com'); @@ -29,7 +29,7 @@ instructions = 'Download FFmpeg 64-Bit Static'; } - } else if (systemInfo.OperatingSystem == 'Linux' && systemInfo.SystemArchitecture != 'Arm') { + } else*/ if (systemInfo.OperatingSystem == 'Linux' && systemInfo.SystemArchitecture != 'Arm') { view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', 'http://johnvansickle.com/ffmpeg');