cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 03:18:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

update components

Browse Source
This commit is contained in:
Luke Pulverenti 2017-01-01 17:55:57 -05:00
parent 511d4882c1
commit 80b537e30b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View File

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.417", "version": "1.4.419",
"_release": "1.4.417", "_release": "1.4.419",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.417", "tag": "1.4.419",
"commit": "d03cd494c958c2fcbc45447fab8b6ab58c925cba" "commit": "e65e31848b76b3cab4193f201517212050de8c53"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

12
dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js vendored
View File

@ -748,7 +748,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
self.seek = function (ticks, player) { self.seek = function (ticks, player) {
player = player || currentPlayer; player = player || currentPlayer;
if (currentPlayer && !enableLocalPlaylistManagement(player)) { if (player && !enableLocalPlaylistManagement(player)) {
return player.seek(ticks); return player.seek(ticks);
} }
@ -1034,17 +1034,17 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
self.instantMix = function (item, player) { self.instantMix = function (item, player) {
player = player || currentPlayer; player = player || currentPlayer;
if (!enableLocalPlaylistManagement(player)) { if (player && !enableLocalPlaylistManagement(player)) {
return player.instantMix(item); return player.instantMix(item);
} }
var apiClient = connectionManager.getApiClient(serverId); var apiClient = connectionManager.getApiClient(item.ServerId);
var options = {}; var options = {};
options.UserId = apiClient.getCurrentUserId(); options.UserId = apiClient.getCurrentUserId();
options.Fields = 'MediaSources'; options.Fields = 'MediaSources';
apiClient.getInstantMixFromItem(id, item).then(function (result) { apiClient.getInstantMixFromItem(item.Id, options).then(function (result) {
self.play({ self.play({
items: result.Items items: result.Items
}); });
@ -1054,7 +1054,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
self.shuffle = function (shuffleItem, player) { self.shuffle = function (shuffleItem, player) {
player = player || currentPlayer; player = player || currentPlayer;
if (!enableLocalPlaylistManagement(player)) { if (player && !enableLocalPlaylistManagement(player)) {
return player.shuffle(shuffleItem); return player.shuffle(shuffleItem);
} }
@ -1177,7 +1177,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
self.currentTime = function (player) { self.currentTime = function (player) {
player = player || currentPlayer; player = player || currentPlayer;
if (currentPlayer && !enableLocalPlaylistManagement(player)) { if (player && !enableLocalPlaylistManagement(player)) {
return player.currentTime(); return player.currentTime();
} }