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 playlist management

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-14 03:03:46 -05:00
parent 893b492cbb
commit 7a6ac9c251
24 changed files with 121 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/bower_components/emby-webcomponents/guide/guide.css vendored
View file

@ -231,9 +231,6 @@
.channelTimeslotHeader, .timeslotHeader {
background: transparent;
}
.timeslotHeader, .channelTimeslotHeader {
height: 2.2em;
}
@ -259,6 +256,9 @@
/* Needed for Firefox */
text-align: left;
contain: strict;
flex-grow: 1;
margin: 0 !important;
padding: 0 !important;
}
.programAccent {

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

@ -33,6 +33,22 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
});
}
if (playbackManager.canQueue(item)) {
if (options.queue !== false) {
commands.push({
name: globalize.translate('sharedcomponents#AddToPlayQueue'),
id: 'queue'
});
}
//if (options.queueAllFromHere) {
// commands.push({
// name: globalize.translate('sharedcomponents#QueueAllFromHere'),
// id: 'queueallfromhere'
// });
//}
}
if ((item.Type === 'Timer') && user.Policy.EnableLiveTvManagement && options.cancelTimer !== false) {
commands.push({
name: globalize.translate('sharedcomponents#CancelRecording'),
@ -152,22 +168,6 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter',
id: 'playallfromhere'
});
}
if (playbackManager.canQueue(item)) {
if (options.queue !== false) {
commands.push({
name: globalize.translate('sharedcomponents#Queue'),
id: 'queue'
});
}
if (options.queueAllFromHere) {
commands.push({
name: globalize.translate('sharedcomponents#QueueAllFromHere'),
id: 'queueallfromhere'
});
}
}
}
if (item.Type === 'Program' && options.record !== false) {

4
dashboard-ui/bower_components/emby-webcomponents/listview/listview.js vendored
View file

@ -398,8 +398,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
if (!clickEntireItem) {
if (options.queueButton) {
html += '<button is="paper-icon-button-light" class="listItemButton itemAction autoSize" data-action="queue"><i class="md-icon">&#xE03B;</i></button>';
if (options.addToListButton) {
html += '<button is="paper-icon-button-light" class="listItemButton itemAction autoSize" data-action="addtoplaylist"><i class="md-icon">&#xE03B;</i></button>';
}
if (options.moreButton !== false) {

4
dashboard-ui/bower_components/emby-webcomponents/playback/playbackvalidation.js vendored
View file

@ -12,8 +12,8 @@ define(['playbackManager'], function (playbackManager) {
self.intercept = function (options) {
// Don't care about video backdrops or any kind of non-fullscreen playback
if (!options.fullscreen && options.mediaType === 'Video') {
// Don't care about video backdrops, or theme music or any kind of non-fullscreen playback
if (!options.fullscreen) {
return Promise.resolve();
}

37
dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js vendored
View file

@ -1,4 +1,4 @@
define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager', 'userSettings', 'embyRouter', 'globalize', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button'], function (shell, dialogHelper, loading, layoutManager, connectionManager, userSettings, embyRouter, globalize) {
define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackManager', 'connectionManager', 'userSettings', 'embyRouter', 'globalize', 'emby-input', 'paper-icon-button-light', 'emby-select', 'material-icons', 'css!./../formdialog', 'emby-button'], function (shell, dialogHelper, loading, layoutManager, playbackManager, connectionManager, userSettings, embyRouter, globalize) {
'use strict';
var currentServerId;
@ -18,8 +18,6 @@
function onSubmit(e) {
loading.show();
var panel = parentWithClass(this, 'dialog');
var playlistId = panel.querySelector('#selectPlaylistToAddTo').value;
@ -38,6 +36,8 @@
function createPlaylist(apiClient, dlg) {
loading.show();
var url = apiClient.getUrl("Playlists", {
Name: dlg.querySelector('#txtNewPlaylistName').value,
@ -72,9 +72,24 @@
function addToPlaylist(apiClient, dlg, id) {
var itemIds = dlg.querySelector('.fldSelectedItemIds').value || '';
if (id === 'queue') {
playbackManager.queue({
serverId: apiClient.serverId(),
ids: itemIds.split(',')
});
dialogHelper.close(dlg);
showToast();
return;
}
loading.show();
var url = apiClient.getUrl("Playlists/" + id + "/Items", {
Ids: dlg.querySelector('.fldSelectedItemIds').value || '',
Ids: itemIds,
userId: apiClient.getCurrentUserId()
});
@ -87,10 +102,13 @@
loading.hide();
dialogHelper.close(dlg);
showToast();
});
}
require(['toast'], function (toast) {
toast(globalize.translate('sharedcomponents#MessageItemsAdded'));
});
function showToast() {
require(['toast'], function (toast) {
toast(globalize.translate('sharedcomponents#MessageItemsAdded'));
});
}
@ -118,6 +136,7 @@
var html = '';
html += '<option value="queue">' + globalize.translate('sharedcomponents#AddToPlayQueue') + '</option>';
html += '<option value="">' + globalize.translate('sharedcomponents#OptionNew') + '</option>';
html += result.Items.map(function (i) {
@ -127,7 +146,7 @@
select.innerHTML = html;
select.value = userSettings.get('playlisteditor-lastplaylistid') || '';
// If the value is empty set it again, in case we tried to set a lastplaylistid that is no longer valid
if (!select.value) {
select.value = '';
@ -161,7 +180,7 @@
html += '</div>';
html += '<div class="formDialogFooter">';
html += '<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">' + globalize.translate('sharedcomponents#ButtonOk') + '</button>';
html += '<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit">' + globalize.translate('sharedcomponents#Add') + '</button>';
html += '</div>';
html += '<input type="hidden" class="fldSelectedItemIds" />';

6
dashboard-ui/bower_components/emby-webcomponents/registrationservices/registrationservices.js vendored
View file

@ -36,7 +36,7 @@
require(['listViewStyle', 'emby-button', 'formDialogStyle'], function () {
var dlg = dialogHelper.createDialog({
size: 'fullscreen-border',
size: layoutManager.tv ? 'fullscreen' : 'fullscreen-border',
removeOnClose: true,
scrollY: false
});
@ -290,7 +290,7 @@
}
var dlg = dialogHelper.createDialog({
size: 'fullscreen-border',
size: layoutManager.tv ? 'fullscreen' : 'fullscreen-border',
removeOnClose: true,
scrollY: false
});
@ -524,7 +524,7 @@
function restorePurchase(unlockableProductInfo) {
var dlg = dialogHelper.createDialog({
size: 'fullscreen-border',
size: layoutManager.tv ? 'fullscreen' : 'fullscreen-border',
removeOnClose: true,
scrollY: false
});

15
dashboard-ui/bower_components/emby-webcomponents/shortcuts.js vendored
View file

@ -326,6 +326,21 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
else if (action === 'playtrailer') {
getItem(target).then(playTrailer);
}
else if (action === 'addtoplaylist') {
getItem(target).then(addToPlaylist);
}
}
function addToPlaylist(item) {
require(['playlistEditor'], function (playlistEditor) {
new playlistEditor().show({
items: [item.Id],
serverId: item.ServerId
});
});
}
function playTrailer(item) {

2
dashboard-ui/components/favoriteitems.js
View file

@ -2,7 +2,7 @@
'use strict';
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
return browserInfo.mobile;
}
function getThumbShape() {

5
dashboard-ui/mypreferenceslanguages.html
View file

@ -73,14 +73,13 @@
<span>${OptionPlayNextEpisodeAutomatically}</span>
</label>
<div class="checkboxContainer fldExternalPlayer checkboxContainer-withDescription">
<div class="checkboxContainer fldExternalPlayer checkboxContainer-withDescription hide">
<label>
<input type="checkbox" is="emby-checkbox" class="chkExternalVideoPlayer" />
<span>${OptionEnableExternalVideoPlayers}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">
<div class="labelGenericExternalPlayers hide">${LabelExternalPlayersHelp}</div>
<div class="labelNativeExternalPlayers hide">${LabelNativeExternalPlayersHelp}</div>
<div class="labelNativeExternalPlayers">${LabelNativeExternalPlayersHelp}</div>
</div>
</div>
</div>

4
dashboard-ui/playlists.html
View file

@ -1,12 +1,14 @@
<div id="playlistsPage" data-dom-cache="true" data-role="page" class="page libraryPage noSecondaryNavPage" data-title="${HeaderPlaylists}">
<div data-role="content">
<div class="viewSettings">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center; padding: 0 .5em 1em;">
<div class="listTopPaging">
&nbsp;
</div>
<button type="button" is="paper-icon-button-light" class="btnNewPlaylist autoSize"><i class="md-icon">add</i></button>
</div>
<div is="emby-itemscontainer" id="items" class="itemsContainer paddedItemsContainer centered"></div>
<div class="noItemsMessage hide" style="text-align: center;">
<p>${MessageNoPlaylistsAvailable}</p>

2
dashboard-ui/scripts/homeupcoming.js
View file

@ -38,7 +38,7 @@
}
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
return browserInfo.mobile;
}
function getThumbShape() {

2
dashboard-ui/scripts/itembynamedetailpage.js
View file

@ -275,7 +275,7 @@
action: 'playallfromhere',
smallIcon: true,
artist: true,
queueButton: true
addToListButton: true
});
break;

6
dashboard-ui/scripts/itemdetailpage.js
View file

@ -73,7 +73,6 @@
item: item,
open: false,
play: false,
queue: false,
playAllFromHere: false,
queueAllFromHere: false,
positionTo: button,
@ -1261,7 +1260,7 @@
image: false,
artist: 'auto',
containerAlbumArtist: item.AlbumArtist,
queueButton: true
addToListButton: true
});
isList = true;
}
@ -1549,6 +1548,9 @@
case 'games':
type = 'Game';
break;
case 'music':
type = 'MusicAlbum';
break;
default:
type = 'Movie';
break;

2
dashboard-ui/scripts/livetvcomponents.js
View file

@ -2,7 +2,7 @@
'use strict';
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
return browserInfo.mobile;
}
function getBackdropShape() {

2
dashboard-ui/scripts/livetvschedule.js
View file

@ -2,7 +2,7 @@
'use strict';
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
return browserInfo.mobile;
}
function renderRecordings(elem, recordings, cardOptions) {

2
dashboard-ui/scripts/moviegenres.js
View file

@ -47,7 +47,7 @@
}
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
return browserInfo.mobile;
}
function getThumbShape() {

2
dashboard-ui/scripts/musicalbums.js
View file

@ -99,7 +99,7 @@
items: result.Items,
context: 'music',
sortBy: query.SortBy,
queueButton: true
addToListButton: true
});
}
else if (viewStyle == "PosterCard") {

8
dashboard-ui/scripts/mypreferenceslanguages.js
View file

@ -186,14 +186,6 @@
view.querySelector('.fldExternalPlayer').classList.add('hide');
}
if (AppInfo.supportsExternalPlayerMenu) {
view.querySelector('.labelNativeExternalPlayers').classList.remove('hide');
view.querySelector('.labelGenericExternalPlayers').classList.add('hide');
} else {
view.querySelector('.labelGenericExternalPlayers').classList.remove('hide');
view.querySelector('.labelNativeExternalPlayers').classList.add('hide');
}
loadPage(view);
});

20
dashboard-ui/scripts/nowplayingbar.js
View file

@ -552,26 +552,24 @@
height: imgHeight
})) : null;
if (url === currentImgUrl) {
return;
if (url !== currentImgUrl) {
currentImgUrl = url;
imageLoader.lazyImage(nowPlayingImageElement, url);
}
currentImgUrl = url;
imageLoader.lazyImage(nowPlayingImageElement, url);
userdataButtons.destroy({
element: nowPlayingUserData
});
if (nowPlayingItem.Id) {
ApiClient.getItem(Dashboard.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {
ApiClient.getItem(Dashboard.getCurrentUserId(), nowPlayingItem.Id).then(function(item) {
userdataButtons.fill({
item: item,
includePlayed: false,
element: nowPlayingUserData
});
});
} else {
userdataButtons.destroy({
element: nowPlayingUserData
});
}
}

12
dashboard-ui/scripts/playlists.js
View file

@ -207,6 +207,18 @@
reloadItems();
});
view.querySelector('.btnNewPlaylist').addEventListener('click', function () {
require(['playlistEditor'], function (playlistEditor) {
var serverId = ApiClient.serverInfo().Id;
new playlistEditor().show({
items: [],
serverId: serverId
});
});
});
onViewStyleChange();
};

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

@ -717,7 +717,7 @@ var AppInfo = {};
AppInfo.enableHomeTabs = false;
if (isAndroid) {
AppInfo.supportsExternalPlayerMenu = true;
AppInfo.supportsExternalPlayers = true;
}
}
else {
@ -1003,12 +1003,6 @@ var AppInfo = {};
paths.hlsjs = bowerPath + "/hlsjs/dist/hls.min";
if ((window.chrome && window.chrome.sockets) || Dashboard.isRunningInCordova()) {
paths.serverdiscovery = apiClientBowerPath + "/serverdiscovery-chrome";
} else {
paths.serverdiscovery = apiClientBowerPath + "/serverdiscovery";
}
define("webActionSheet", [embyWebComponentsBowerPath + "/actionsheet/actionsheet"], returnFirstDependency);
if (Dashboard.isRunningInCordova()) {
@ -1367,7 +1361,7 @@ var AppInfo = {};
appSettings.set('externalplayers', val.toString());
}
return appSettings.get('externalplayers') == 'true';
return appSettings.get('externalplayers') === 'true';
};
return appSettings;
@ -1403,6 +1397,16 @@ var AppInfo = {};
define("registerElement", []);
}
if ((window.chrome && window.chrome.sockets)) {
define("serverdiscovery", [apiClientBowerPath + "/serverdiscovery-chrome"], returnFirstDependency);
} else if (Dashboard.isRunningInCordova() && browser.android) {
define("serverdiscovery", ["cordova/serverdiscovery"], returnFirstDependency);
} else if (Dashboard.isRunningInCordova() && browser.safari) {
define("serverdiscovery", [apiClientBowerPath + "/serverdiscovery-chrome"], returnFirstDependency);
} else {
define("serverdiscovery", [apiClientBowerPath + "/serverdiscovery"], returnFirstDependency);
}
if (Dashboard.isRunningInCordova() && browser.safari) {
define("imageFetcher", ['cordova/imagestore'], returnFirstDependency);
} else {

2
dashboard-ui/scripts/songs.js
View file

@ -74,7 +74,7 @@
action: 'playallfromhere',
smallIcon: true,
artist: true,
queueButton: true
addToListButton: true
});
var i, length;

2
dashboard-ui/scripts/tvgenres.js
View file

@ -47,7 +47,7 @@
}
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
return browserInfo.mobile;
}
function getThumbShape() {

3
dashboard-ui/strings/en-US.json
View file

@ -981,8 +981,7 @@
"LabelConnectUserNameHelp": "Connect this local user to an online Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.",
"ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect",
"LabelExternalPlayers": "External players:",
"LabelExternalPlayersHelp": "Display buttons to play content in external players. This is only available on devices that support url schemes, generally Android and iOS. With external players there is generally no support for remote control or resuming.",
"LabelNativeExternalPlayersHelp": "Display buttons to play content in external players.",
"LabelNativeExternalPlayersHelp": "Play videos using external players.",
"HeaderSubtitleProfile": "Subtitle Profile",
"HeaderSubtitleProfiles": "Subtitle Profiles",
"HeaderSubtitleProfilesHelp": "Subtitle profiles describe the subtitle formats supported by the device.",