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

update program queries

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-10 14:18:28 -04:00
parent 023f7299eb
commit f11a08df43
50 changed files with 86 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js vendored
View file

@ -31,7 +31,14 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
if ((item.Type == 'Timer') && user.Policy.EnableLiveTvManagement && options.cancelTimer !== false) {
commands.push({
name: globalize.translate('sharedcomponents#ButtonCancel'),
name: globalize.translate('sharedcomponents#CancelRecording'),
id: 'canceltimer'
});
}
if ((item.Type == 'Recording' && item.Status == 'InProgress') && user.Policy.EnableLiveTvManagement && options.cancelTimer !== false) {
commands.push({
name: globalize.translate('sharedcomponents#CancelRecording'),
id: 'canceltimer'
});
}
@ -500,7 +507,9 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
require(['recordingHelper'], function (recordingHelper) {
recordingHelper.cancelTimerWithConfirmation(item.Id, item.ServerId).then(function() {
var timerId = item.TimerId || item.Id;
recordingHelper.cancelTimerWithConfirmation(timerId, item.ServerId).then(function () {
getResolveFunction(resolve, command, true)();
});
});