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

fix merge conflicts

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-19 14:49:42 -05:00
parent bcfee41a57
commit d33230d361
97 changed files with 1205 additions and 811 deletions
Download patch file Download diff file Expand all files Collapse all files

50
dashboard-ui/scripts/librarybrowser.js
View file

@ -155,7 +155,7 @@
enableFullPaperTabs: function () {
if (browserInfo.animate && !browserInfo.mobile) {
//return true;
return true;
}
return AppInfo.isNativeApp;
@ -834,27 +834,37 @@
});
Dashboard.alert(Globalize.translate('MessageRefreshQueued'));
},
deleteItem: function (itemId) {
deleteItems: function (itemIds) {
// The timeout allows the flyout to close
setTimeout(function () {
return new Promise(function (resolve, reject) {
var msg = Globalize.translate('ConfirmDeleteItem');
var title = Globalize.translate('HeaderDeleteItem');
Dashboard.confirm(msg, Globalize.translate('HeaderDeleteItem'), function (result) {
if (itemIds.length > 1) {
msg = Globalize.translate('ConfirmDeleteItems');
title = Globalize.translate('HeaderDeleteItems');
}
Dashboard.confirm(msg, title, function (result) {
if (result) {
ApiClient.deleteItem(itemId);
Events.trigger(LibraryBrowser, 'itemdeleting', [itemId]);
var promises = itemIds.map(function (itemId) {
ApiClient.deleteItem(itemId);
Events.trigger(LibraryBrowser, 'itemdeleting', [itemId]);
});
resolve();
} else {
reject();
}
});
}, 250);
});
},
editImages: function (itemId) {
@ -876,11 +886,11 @@
editMetadata: function (itemId) {
Dashboard.navigate('edititemmetadata.html?id=' + itemId);
return;
require(['components/metadataeditor/metadataeditor'], function () {
MetadataEditor.show(itemId);
});
//require(['components/metadataeditor/metadataeditor'], function (metadataeditor) {
// metadataeditor.show(itemId);
//});
},
showMoreCommands: function (positionTo, itemId, commands) {
@ -991,7 +1001,7 @@
PlaylistManager.showPanel([itemId]);
break;
case 'delete':
LibraryBrowser.deleteItem(itemId);
LibraryBrowser.deleteItems([itemId]);
break;
case 'download':
{
@ -1594,12 +1604,8 @@
itemCommands.push('queuefromhere');
}
// There's no detail page with a dedicated delete function
if (item.Type == 'Playlist' || item.Type == 'BoxSet') {
if (item.CanDelete) {
itemCommands.push('delete');
}
if (item.CanDelete) {
itemCommands.push('delete');
}
if (SyncManager.isAvailable(item)) {
@ -2892,7 +2898,7 @@
var fireCallbackOnClose = false;
var delay = browserInfo.animate ? 0 : 100;
setTimeout(function() {
setTimeout(function () {
paperDialogHelper.open(dlg).then(function () {
if (options.callback && fireCallbackOnClose) {