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

use shared playlist editor

Browse source
This commit is contained in:
Luke Pulverenti 2016-05-22 02:08:44 -04:00
parent dcb6b103ec
commit 6a539b8f3a
13 changed files with 362 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
define(['playlistManager', 'scrollHelper', 'appSettings', 'appStorage', 'apphost', 'datetime', 'jQuery', 'itemHelper', 'mediaInfo', 'scrollStyles'], function (playlistManager, scrollHelper, appSettings, appStorage, appHost, datetime, $, itemHelper, mediaInfo) {
define(['scrollHelper', 'appSettings', 'appStorage', 'apphost', 'datetime', 'jQuery', 'itemHelper', 'mediaInfo', 'scrollStyles'], function (scrollHelper, appSettings, appStorage, appHost, datetime, $, itemHelper, mediaInfo) {
function parentWithClass(elem, className) {
@ -670,11 +670,11 @@
var commands = [];
if (LibraryBrowser.supportsAddingToCollection(item)) {
if (itemHelper.supportsAddingToCollection(item)) {
commands.push('addtocollection');
}
if (playlistManager.supportsPlaylists(item)) {
if (itemHelper.supportsAddingToPlaylist(item)) {
commands.push('playlist');
}
@ -938,9 +938,11 @@
});
break;
case 'playlist':
require(['playlistManager'], function (playlistManager) {
playlistManager.showPanel([itemId]);
require(['playlistEditor'], function (playlistEditor) {
new playlistEditor().show({
items: items,
serverId: serverId
});
});
break;
case 'delete':
@ -1561,13 +1563,6 @@
return html;
},
supportsAddingToCollection: function (item) {
var invalidTypes = ['Person', 'Genre', 'MusicGenre', 'Studio', 'GameGenre', 'BoxSet', 'Playlist', 'UserView', 'CollectionFolder', 'Audio', 'Episode', 'TvChannel', 'Program', 'MusicAlbum', 'Timer'];
return !item.CollectionType && invalidTypes.indexOf(item.Type) == -1 && item.MediaType != 'Photo';
},
enableSync: function (item, user) {
if (AppInfo.isNativeApp && !Dashboard.capabilities().SupportsSync) {
return false;
@ -1604,7 +1599,7 @@
itemCommands.push('shuffle');
}
if (playlistManager.supportsPlaylists(item)) {
if (itemHelper.supportsAddingToPlaylist(item)) {
if (options.showRemoveFromPlaylist) {
itemCommands.push('removefromplaylist');
@ -1614,7 +1609,7 @@
}
if (options.showAddToCollection !== false) {
if (LibraryBrowser.supportsAddingToCollection(item)) {
if (itemHelper.supportsAddingToCollection(item)) {
itemCommands.push('addtocollection');
}
}