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

updated voice components

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-06 15:45:37 -04:00
parent b9e37b50ec
commit 0ccf565956
3 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/bower_components/emby-webcomponents/voice/voiceprocessor.js vendored
View file

@ -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 });
}

16
dashboard-ui/scripts/site.js
View file

@ -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) {

4
dashboard-ui/scripts/wizardcomponents.js
View file

@ -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', '<a target="_blank" href="https://ffmpeg.zeranoe.com/builds">https://ffmpeg.zeranoe.com</a>');
@ -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', '<a target="_blank" href="http://johnvansickle.com/ffmpeg">http://johnvansickle.com/ffmpeg</a>');