mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update components
This commit is contained in:
parent
f4278dfc1a
commit
1e3bc96dab
6 changed files with 81 additions and 15 deletions
|
@ -14,12 +14,12 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {},
|
"devDependencies": {},
|
||||||
"ignore": [],
|
"ignore": [],
|
||||||
"version": "1.4.446",
|
"version": "1.4.447",
|
||||||
"_release": "1.4.446",
|
"_release": "1.4.447",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "1.4.446",
|
"tag": "1.4.447",
|
||||||
"commit": "6b6f1772ecf75132f04e1ef08bcd37a5bcb040d1"
|
"commit": "91e92ebbc11384f3d18e115f81dd0f359ad5190a"
|
||||||
},
|
},
|
||||||
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
||||||
"_target": "^1.2.1",
|
"_target": "^1.2.1",
|
||||||
|
|
|
@ -301,7 +301,7 @@
|
||||||
|
|
||||||
function onRotationInterval() {
|
function onRotationInterval() {
|
||||||
|
|
||||||
if (playbackManager.isPlayingVideo()) {
|
if (playbackManager.isPlayingLocally(['Video'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -698,6 +698,23 @@
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
self.isPlaying = function () {
|
||||||
|
var state = self.lastPlayerData || {};
|
||||||
|
return state.NowPlayingItem != null;
|
||||||
|
};
|
||||||
|
|
||||||
|
self.isPlayingVideo = function () {
|
||||||
|
var state = self.lastPlayerData || {};
|
||||||
|
state = state.NowPlayingItem || {};
|
||||||
|
return state.MediaType === 'Video';
|
||||||
|
};
|
||||||
|
|
||||||
|
self.isPlayingAudio = function () {
|
||||||
|
var state = self.lastPlayerData || {};
|
||||||
|
state = state.NowPlayingItem || {};
|
||||||
|
return state.MediaType === 'Audio';
|
||||||
|
};
|
||||||
|
|
||||||
self.currentTime = function (val) {
|
self.currentTime = function (val) {
|
||||||
|
|
||||||
if (val != null) {
|
if (val != null) {
|
||||||
|
|
|
@ -88,7 +88,7 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
|
||||||
|
|
||||||
function showNewItemNotification(item, apiClient) {
|
function showNewItemNotification(item, apiClient) {
|
||||||
|
|
||||||
if (playbackManager.isPlayingVideo()) {
|
if (playbackManager.isPlayingLocally(['Video'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -478,14 +478,36 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
|
||||||
triggerPlayerChange(player, targetInfo, previousPlayer, previousTargetInfo);
|
triggerPlayerChange(player, targetInfo, previousPlayer, previousTargetInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.isPlaying = function () {
|
self.isPlaying = function (player) {
|
||||||
var player = currentPlayer;
|
player = player || currentPlayer;
|
||||||
|
if (player && !enableLocalPlaylistManagement(player)) {
|
||||||
|
return player.isPlaying();
|
||||||
|
}
|
||||||
return player != null && player.currentSrc() != null;
|
return player != null && player.currentSrc() != null;
|
||||||
};
|
};
|
||||||
|
|
||||||
self.isPlayingVideo = function () {
|
self.isPlayingLocally = function (mediaTypes, player) {
|
||||||
|
|
||||||
|
player = player || currentPlayer;
|
||||||
|
|
||||||
|
if (!player || !player.isLocalPlayer) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var playerData = getPlayerData(player) || {};
|
||||||
|
|
||||||
|
return mediaTypes.indexOf((playerData.streamInfo || {}).mediaType || '') !== -1;
|
||||||
|
};
|
||||||
|
|
||||||
|
self.isPlayingVideo = function (player) {
|
||||||
|
|
||||||
|
player = player || currentPlayer;
|
||||||
|
if (player && !enableLocalPlaylistManagement(player)) {
|
||||||
|
return player.isPlayingVideo();
|
||||||
|
}
|
||||||
|
|
||||||
if (self.isPlaying()) {
|
if (self.isPlaying()) {
|
||||||
var playerData = getPlayerData(currentPlayer);
|
var playerData = getPlayerData(player);
|
||||||
|
|
||||||
return playerData.streamInfo.mediaType === 'Video';
|
return playerData.streamInfo.mediaType === 'Video';
|
||||||
}
|
}
|
||||||
|
@ -493,9 +515,14 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
self.isPlayingAudio = function () {
|
self.isPlayingAudio = function (player) {
|
||||||
|
player = player || currentPlayer;
|
||||||
|
if (player && !enableLocalPlaylistManagement(player)) {
|
||||||
|
return player.isPlayingAudio();
|
||||||
|
}
|
||||||
|
|
||||||
if (self.isPlaying()) {
|
if (self.isPlaying()) {
|
||||||
var playerData = getPlayerData(currentPlayer);
|
var playerData = getPlayerData(player);
|
||||||
|
|
||||||
return playerData.streamInfo.mediaType === 'Audio';
|
return playerData.streamInfo.mediaType === 'Audio';
|
||||||
}
|
}
|
||||||
|
@ -697,7 +724,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
|
||||||
return fullscreenManager.isFullScreen();
|
return fullscreenManager.isFullScreen();
|
||||||
};
|
};
|
||||||
|
|
||||||
self.toggleFullscreen = function(player) {
|
self.toggleFullscreen = function (player) {
|
||||||
|
|
||||||
player = player || currentPlayer;
|
player = player || currentPlayer;
|
||||||
if (!player.isLocalPlayer || player.toggleFulscreen) {
|
if (!player.isLocalPlayer || player.toggleFulscreen) {
|
||||||
|
|
|
@ -83,9 +83,14 @@
|
||||||
sendPlayCommand(options, 'PlayLast');
|
sendPlayCommand(options, 'PlayLast');
|
||||||
};
|
};
|
||||||
|
|
||||||
self.canQueueMediaType = function (mediaType) {
|
self.canPlayMediaType = function (mediaType) {
|
||||||
|
|
||||||
return mediaType === 'Audio' || mediaType === 'Video';
|
mediaType = (mediaType || '').toLowerCase();
|
||||||
|
return mediaType === 'audio' || mediaType === 'video';
|
||||||
|
};
|
||||||
|
|
||||||
|
self.canQueueMediaType = function (mediaType) {
|
||||||
|
return self.canPlayMediaType(mediaType);
|
||||||
};
|
};
|
||||||
|
|
||||||
self.stop = function () {
|
self.stop = function () {
|
||||||
|
@ -224,6 +229,23 @@
|
||||||
sendCommandByName('DisplayContent', options);
|
sendCommandByName('DisplayContent', options);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
self.isPlaying = function () {
|
||||||
|
var state = self.lastPlayerData || {};
|
||||||
|
return state.NowPlayingItem != null;
|
||||||
|
};
|
||||||
|
|
||||||
|
self.isPlayingVideo = function () {
|
||||||
|
var state = self.lastPlayerData || {};
|
||||||
|
state = state.NowPlayingItem || {};
|
||||||
|
return state.MediaType === 'Video';
|
||||||
|
};
|
||||||
|
|
||||||
|
self.isPlayingAudio = function () {
|
||||||
|
var state = self.lastPlayerData || {};
|
||||||
|
state = state.NowPlayingItem || {};
|
||||||
|
return state.MediaType === 'Audio';
|
||||||
|
};
|
||||||
|
|
||||||
self.getPlayerState = function () {
|
self.getPlayerState = function () {
|
||||||
|
|
||||||
var apiClient = window.ApiClient;
|
var apiClient = window.ApiClient;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue