1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update now playing screen

This commit is contained in:
Luke Pulverenti 2017-01-18 08:33:18 -05:00
parent 3ead8a75b4
commit ad285bf734
20 changed files with 265 additions and 119 deletions

View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.474",
"_release": "1.4.474",
"version": "1.4.475",
"_release": "1.4.475",
"_resolution": {
"type": "version",
"tag": "1.4.474",
"commit": "6e74a88452ec9dee906696b042c969dcc1aee842"
"tag": "1.4.475",
"commit": "ee9afc32bf7c7da8a40158d556cb217bd2c80ef5"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

View file

@ -971,15 +971,19 @@
});
};
self.getPlaylist = function () {
return Promise.resolve([]);
};
self.getCurrentPlaylistIndex = function () {
return 0;
};
self.setCurrentPlaylistIndex = function (index) {
self.setCurrentPlaylistItem = function (playlistItemId) {
return Promise.resolve();
};
self.removeFromPlaylist = function (index) {
self.removeFromPlaylist = function (playlistItemIds) {
return Promise.resolve();
};

View file

@ -107,20 +107,35 @@
function onDrop(evt, itemsContainer) {
loading.show();
var el = evt.item;
var newIndex = evt.newIndex;
var itemId = el.getAttribute('data-playlistitemid');
var playlistId = el.getAttribute('data-playlistid');
if (!playlistId) {
var oldIndex = evt.oldIndex;
el.dispatchEvent(new CustomEvent('itemdrop', {
detail: {
oldIndex: oldIndex,
newIndex: newIndex,
playlistItemId: itemId
},
bubbles: true,
cancelable: false
}));
return;
}
var serverId = el.getAttribute('data-serverid');
var apiClient = connectionManager.getApiClient(serverId);
newIndex = Math.max(0, newIndex - 1);
loading.show();
apiClient.ajax({
url: apiClient.getUrl('Playlists/' + playlistId + '/Items/' + itemId + '/Move/' + newIndex),
@ -129,7 +144,6 @@
}).then(function () {
el.setAttribute('data-index', newIndex);
loading.hide();
}, function () {
@ -171,7 +185,7 @@
// dragging ended
onEnd: function (/**Event*/evt) {
onDrop(evt, self);
return onDrop(evt, self);
}
});
});

View file

@ -42,6 +42,7 @@
.listViewDragHandle {
margin-left: -.25em !important;
touch-action: none;
}
.listItemBody {

View file

@ -235,7 +235,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
var collectionTypeData = item.CollectionType ? (' data-collectiontype="' + item.CollectionType + '"') : '';
var channelIdData = item.ChannelId ? (' data-channelid="' + item.ChannelId + '"') : '';
html += '<' + outerTagName + ' class="' + cssClass + '" data-index="' + i + '"' + playlistItemId + ' data-action="' + action + '" data-isfolder="' + item.IsFolder + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-type="' + item.Type + '"' + mediaTypeData + collectionTypeData + channelIdData + positionTicksData + collectionIdData + playlistIdData + '>';
html += '<' + outerTagName + ' class="' + cssClass + '"' + playlistItemId + ' data-action="' + action + '" data-isfolder="' + item.IsFolder + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-type="' + item.Type + '"' + mediaTypeData + collectionTypeData + channelIdData + positionTicksData + collectionIdData + playlistIdData + '>';
if (!clickEntireItem && options.dragHandle) {
//html += '<button is="paper-icon-button-light" class="listViewDragHandle autoSize listItemButton"><i class="md-icon">&#xE25D;</i></button>';

View file

@ -30,6 +30,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
var repeatMode = 'RepeatNone';
var playlist = [];
var currentPlaylistIndex;
var currentPlaylistItemId;
var currentPlayOptions;
var playNextAfterEnded = true;
var playerStates = {};
@ -454,8 +455,14 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
});
};
self.playlist = function () {
return playlist.slice(0);
self.getPlaylist = function (player) {
player = player || currentPlayer;
if (player && !enableLocalPlaylistManagement(player)) {
return player.getPlaylist();
}
return Promise.resolve(playlist.slice(0));
};
self.getCurrentPlayer = function () {
@ -916,9 +923,9 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
changeStream(player, ticks);
};
self.nextChapter = function () {
self.nextChapter = function (player) {
var player = currentPlayer;
player = player || currentPlayer;
var item = self.currentItem(player);
var ticks = getCurrentTicks(player);
@ -930,15 +937,15 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
})[0];
if (nextChapter) {
self.seek(nextChapter.StartPositionTicks);
self.seek(nextChapter.StartPositionTicks, player);
} else {
self.nextTrack();
self.nextTrack(player);
}
};
self.previousChapter = function () {
self.previousChapter = function (player) {
var player = currentPlayer;
player = player || currentPlayer;
var item = self.currentItem(player);
var ticks = getCurrentTicks(player);
@ -946,21 +953,26 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
// Go back 10 seconds
ticks -= 100000000;
// If there's no previous track, then at least rewind to beginning
if (self.getCurrentPlaylistIndex(player) === 0) {
ticks = Math.max(ticks, 0);
}
var previousChapters = (item.Chapters || []).filter(function (i) {
return i.StartPositionTicks <= ticks;
});
if (previousChapters.length) {
self.seek(previousChapters[previousChapters.length - 1].StartPositionTicks);
self.seek(previousChapters[previousChapters.length - 1].StartPositionTicks, player);
} else {
self.previousTrack();
self.previousTrack(player);
}
};
self.fastForward = function () {
self.fastForward = function (player) {
var player = currentPlayer;
player = player || currentPlayer;
if (player.fastForward != null) {
player.fastForward(userSettings.skipForwardLength());
@ -979,9 +991,9 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
}
};
self.rewind = function () {
self.rewind = function (player) {
var player = currentPlayer;
player = player || currentPlayer;
if (player.rewind != null) {
player.rewind(userSettings.skipBackLength());
@ -1492,7 +1504,15 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
}
var afterPlayInternal = function () {
setPlaylistState(0, items);
for (var i = 0, length = items.length; i < length; i++) {
addUniquePlaylistItemId(items[i]);
}
playlist = items.slice(0);
var playIndex = 0;
setPlaylistState(items[playIndex].PlaylistItemId, playIndex);
loading.hide();
};
@ -1519,13 +1539,22 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
return true;
}
// Set currentPlaylistIndex and playlist. Using a method allows for overloading in derived player implementations
function setPlaylistState(i, items) {
if (!isNaN(i)) {
currentPlaylistIndex = i;
var currentId = 0;
function addUniquePlaylistItemId(item) {
if (!item.PlaylistItemId) {
item.PlaylistItemId = "playlistItem" + currentId;
currentId++;
}
if (items) {
playlist = items.slice(0);
}
// Set playlist state. Using a method allows for overloading in derived player implementations
function setPlaylistState(playlistItemId, index) {
if (!isNaN(index)) {
currentPlaylistIndex = index;
currentPlaylistItemId = playlistItemId;
}
}
@ -2215,55 +2244,114 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
}
}
self.setCurrentPlaylistIndex = function (i, player) {
function findPlaylistIndex(playlistItemId, list) {
for (var i = 0, length = playlist.length; i < length; i++) {
if (list[i].PlaylistItemId === playlistItemId) {
return i;
}
}
return -1;
}
self.setCurrentPlaylistItem = function (playlistItemId, player) {
player = player || currentPlayer;
if (player && !enableLocalPlaylistManagement(player)) {
return player.setCurrentPlaylistIndex(i);
return player.setCurrentPlaylistItem(playlistItemId);
}
var newItem = playlist[i];
var newItem;
var newItemIndex;
for (var i = 0, length = playlist.length; i < length; i++) {
if (playlist[i].PlaylistItemId === playlistItemId) {
newItem = playlist[i];
newItemIndex = i;
break;
}
}
var playOptions = Object.assign({}, currentPlayOptions, {
startPositionTicks: 0
});
if (newItem) {
var playOptions = Object.assign({}, currentPlayOptions, {
startPositionTicks: 0
});
playInternal(newItem, playOptions, function () {
currentPlaylistIndex = i;
});
playInternal(newItem, playOptions, function () {
setPlaylistState(newItem.PlaylistItemId, newItemIndex);
});
}
};
self.removeFromPlaylist = function (index, player) {
self.removeFromPlaylist = function (playlistItemIds, player) {
if (index < 0) {
throw new Error('Invalid playlist index');
if (!playlistItemIds) {
throw new Error('Invalid playlistItemIds');
}
player = player || currentPlayer;
if (player && !enableLocalPlaylistManagement(player)) {
return player.removeFromPlaylist(i);
return player.removeFromPlaylist(playlistItemIds);
}
if (playlist.length <= 1) {
if (playlist.length <= playlistItemIds.length) {
return self.stop();
}
var isCurrentIndex = self.getCurrentPlaylistIndex(player) === index;
playlist.splice(index, 1);
var currentPlaylistItemId = self.currentItem(player).PlaylistItemId;
var isCurrentIndex = playlistItemIds.indexOf(currentPlaylistItemId) !== -1;
playlist = playlist.filter(function (item) {
return playlistItemIds.indexOf(item.PlaylistItemId) === -1;
});
events.trigger(player, 'playlistitemremove', [
{
index: index
playlistItemIds: playlistItemIds
}]);
if (isCurrentIndex) {
return self.setCurrentPlaylistIndex(Math.min(index, playlist.length - 1), player);
return self.setCurrentPlaylistItem(0, player);
}
return Promise.resolve();
};
function moveInArray(array, from, to) {
array.splice(to, 0, array.splice(from, 1)[0]);
}
self.movePlaylistItem = function (playlistItemId, newIndex, player) {
player = player || currentPlayer;
if (player && !enableLocalPlaylistManagement(player)) {
return player.movePlaylistItem(playlistItemId, newIndex);
}
var oldIndex;
for (var i = 0, length = playlist.length; i < length; i++) {
if (playlist[i].PlaylistItemId === playlistItemId) {
oldIndex = i;
break;
}
}
if (oldIndex === -1 || oldIndex === newIndex) {
return;
}
if (newIndex >= playlist.length) {
throw new Error('newIndex out of bounds');
}
moveInArray(playlist, oldIndex, newIndex);
events.trigger(player, 'playlistitemmove', [
{
playlistItemId: playlistItemId,
newIndex: newIndex
}]);
};
self.getCurrentPlaylistIndex = function (i, player) {
player = player || currentPlayer;
@ -2271,7 +2359,17 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
return player.getCurrentPlaylistIndex();
}
return currentPlaylistIndex;
return findPlaylistIndex(currentPlaylistItemId, playlist);
};
self.getCurrentPlaylistItemId = function (i, player) {
player = player || currentPlayer;
if (player && !enableLocalPlaylistManagement(player)) {
return player.getCurrentPlaylistItemId();
}
return currentPlaylistItemId;
};
self.setRepeatMode = function (value, player) {
@ -2295,7 +2393,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
return repeatMode;
};
function getNextItemInfo() {
function getNextItemInfo(player) {
var newIndex;
var playlistLength = playlist.length;
@ -2303,16 +2401,16 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
switch (self.getRepeatMode()) {
case 'RepeatOne':
newIndex = currentPlaylistIndex;
newIndex = self.getCurrentPlaylistIndex(player);
break;
case 'RepeatAll':
newIndex = currentPlaylistIndex + 1;
newIndex = self.getCurrentPlaylistIndex(player) + 1;
if (newIndex >= playlistLength) {
newIndex = 0;
}
break;
default:
newIndex = currentPlaylistIndex + 1;
newIndex = self.getCurrentPlaylistIndex(player) + 1;
break;
}
@ -2339,7 +2437,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
return player.nextTrack();
}
var newItemInfo = getNextItemInfo();
var newItemInfo = getNextItemInfo(player);
if (newItemInfo) {
@ -2350,7 +2448,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
});
playInternal(newItemInfo.item, playOptions, function () {
setPlaylistState(newItemInfo.index);
setPlaylistState(newItemInfo.item.PlaylistItemId, newItemInfo.index);
});
}
};
@ -2362,7 +2460,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
return player.previousTrack();
}
var newIndex = currentPlaylistIndex - 1;
var newIndex = self.getCurrentPlaylistIndex(player) - 1;
if (newIndex >= 0) {
var newItem = playlist[newIndex];
@ -2373,7 +2471,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
});
playInternal(newItem, playOptions, function () {
setPlaylistState(newIndex);
setPlaylistState(newItem.PlaylistItemId, newIndex);
});
}
}
@ -2431,6 +2529,8 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
function queueAll(items, mode) {
for (var i = 0, length = items.length; i < length; i++) {
addUniquePlaylistItemId(items[i]);
playlist.push(items[i]);
}
}
@ -2531,7 +2631,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
clearProgressInterval(player);
var nextItem = playNextAfterEnded ? getNextItemInfo() : null;
var nextItem = playNextAfterEnded ? getNextItemInfo(player) : null;
var nextMediaType = (nextItem ? nextItem.item.MediaType : null);
@ -2548,6 +2648,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
if (!nextItem) {
playlist = [];
currentPlaylistIndex = -1;
currentPlaylistItemId = null;
}
events.trigger(player, 'playbackstop', [state]);

View file

@ -44,13 +44,6 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
});
}
if (playbackManager.canQueue(item)) {
menuItems.push({
name: globalize.translate('sharedcomponents#Queue'),
id: 'queue'
});
}
if (itemType === "Audio" || itemType === "MusicAlbum" || itemType === "MusicArtist" || itemType === "MusicGenre") {
menuItems.push({
name: globalize.translate('sharedcomponents#InstantMix'),

View file

@ -178,6 +178,7 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
isBack: isBackNav,
state: ctx.state,
type: route.type,
fullscreen: route.fullscreen,
controllerFactory: controllerFactory,
options: {
supportsThemeMedia: route.supportsThemeMedia || false

View file

@ -283,15 +283,19 @@
return state.MediaType === 'Audio';
};
self.getPlaylist = function () {
return Promise.resolve([]);
};
self.getCurrentPlaylistIndex = function () {
return 0;
};
self.setCurrentPlaylistIndex = function (index) {
self.setCurrentPlaylistItem = function (playlistItemId) {
return Promise.resolve();
};
self.removeFromPlaylist = function (index) {
self.removeFromPlaylist = function (playlistItemIds) {
return Promise.resolve();
};

View file

@ -288,7 +288,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
}
else if (action === 'setplaylistindex') {
playbackManager.setCurrentPlaylistIndex(parseInt(card.getAttribute('data-index')));
playbackManager.setCurrentPlaylistItem(card.getAttribute('data-playlistitemid'));
}
else if (action === 'record') {
@ -337,8 +337,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
card.dispatchEvent(new CustomEvent('action-' + customAction, {
detail: {
item: getItem(target),
index: parseInt(card.getAttribute('data-index') || '-1')
playlistItemId: card.getAttribute('data-playlistitemid')
},
cancelable: false,
bubbles: true

View file

@ -43,6 +43,16 @@ define(['browser', 'dom', 'css!./viewcontainer-lite'], function (browser, dom) {
if (options.type) {
view.setAttribute('data-type', options.type);
}
var properties = [];
if (options.fullscreen) {
properties.push('fullscreen');
}
if (properties.length) {
view.setAttribute('data-properties', properties.join(','));
}
view.innerHTML = options.view;
var currentPage = allPages[pageIndex];

View file

@ -65,23 +65,33 @@ define(['viewcontainer', 'focusManager', 'queryString', 'layoutManager'], functi
}
}
function getProperties(view) {
var props = view.getAttribute('data-properties');
if (props) {
return props.split(',');
}
return [];
}
function dispatchViewEvent(view, eventName, isRestored, isCancellable) {
var eventDetail = {
type: view.getAttribute('data-type'),
isRestored: isRestored,
properties: getProperties(view)
};
var eventResult = view.dispatchEvent(new CustomEvent(eventName, {
detail: {
type: view.getAttribute('data-type'),
isRestored: isRestored
},
detail: eventDetail,
bubbles: true,
cancelable: isCancellable || false
}));
if (dispatchPageEvents) {
view.dispatchEvent(new CustomEvent(eventName.replace('view', 'page'), {
detail: {
type: view.getAttribute('data-type'),
isRestored: isRestored
},
detail: eventDetail,
bubbles: true,
cancelable: false
}));
@ -93,13 +103,13 @@ define(['viewcontainer', 'focusManager', 'queryString', 'layoutManager'], functi
function getViewEventDetail(view, options, isRestore) {
var url = options.url;
var state = options.state;
var index = url.indexOf('?');
var params = index === -1 ? {} : queryString.parse(url.substring(index + 1));
return {
detail: {
type: view.getAttribute('data-type'),
properties: getProperties(view),
params: params,
isRestored: isRestore,
state: options.state,