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 components

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-02 23:49:52 -04:00
parent c7b23209cf
commit 6f73ce4cc3
16 changed files with 332 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
});
}
if (item.Type == 'Timer' && user.Policy.EnableLiveTvManagement) {
if ((item.Type == 'Timer') && user.Policy.EnableLiveTvManagement) {
commands.push({
name: globalize.translate('sharedcomponents#ButtonCancel'),
id: 'canceltimer'
@ -53,9 +53,9 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
if (itemHelper.canEdit(user, item.Type)) {
if (options.edit !== false) {
if (options.edit !== false && item.Type != 'SeriesTimer') {
var text = item.Type == 'Timer' ? globalize.translate('sharedcomponents#Edit') : globalize.translate('sharedcomponents#EditInfo');
var text = (item.Type == 'Timer' || item.Type == 'SeriesTimer') ? globalize.translate('sharedcomponents#Edit') : globalize.translate('sharedcomponents#EditInfo');
commands.push({
name: text,
@ -120,15 +120,6 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
}
}
//if (options.open !== false) {
// if (item.Type != 'Timer' && item.Type != 'Audio') {
// commands.push({
// name: globalize.translate('sharedcomponents#Open'),
// id: 'open'
// });
// }
//}
if (canPlay) {
if (options.play !== false) {
commands.push({
@ -178,7 +169,7 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
if (user.Policy.IsAdministrator) {
if (item.Type != 'Timer' && item.Type != 'Program') {
if (item.Type != 'Timer' && item.Type != 'SeriesTimer' && item.Type != 'Program') {
commands.push({
name: globalize.translate('sharedcomponents#Refresh'),
id: 'refresh'
@ -503,7 +494,11 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
loading.show();
apiClient.cancelLiveTvTimer(item.Id).then(function () {
var promise = item.Type == 'SeriesTimer' ?
apiClient.cancelLiveTvSeriesTimer(item.Id) :
apiClient.cancelLiveTvTimer(item.Id);
promise.then(function () {
require(['toast'], function (toast) {
toast(globalize.translate('sharedcomponents#RecordingCancelled'));
@ -547,6 +542,11 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
if (item.Type == 'Timer') {
require(['recordingEditor'], function (recordingEditor) {
recordingEditor.show(item.Id, serverId).then(resolve, reject);
});
} else if (item.Type == 'SeriesTimer') {
require(['seriesRecordingEditor'], function (recordingEditor) {
recordingEditor.show(item.Id, serverId).then(resolve, reject);
});
} else {
@ -602,6 +602,10 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
return getCommands(options).then(function (commands) {
if (!commands.length) {
return Promise.reject();
}
return new Promise(function (resolve, reject) {
require(['actionsheet'], function (actionSheet) {