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 components

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-02 14:43:31 -05:00
parent 3f3259b8e5
commit b049c42405
7 changed files with 48 additions and 105 deletions
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": {},
"ignore": [],
"version": "1.4.424",
"_release": "1.4.424",
"version": "1.4.426",
"_release": "1.4.426",
"_resolution": {
"type": "version",
"tag": "1.4.424",
"commit": "00bfcb7133668cc35daf2e1aa0563adb33dafbee"
"tag": "1.4.426",
"commit": "5c5e8e3baaf9fa4dd2d3f8e91e22caae899b37a1"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

2
dashboard-ui/bower_components/emby-webcomponents/backdrop/backdrop.js vendored
View file

@ -201,7 +201,7 @@
return item.BackdropImageTags.map(function (imgTag, index) {
return apiClient.getScaledImageUrl(item.Id, Object.assign(imageOptions, {
return apiClient.getScaledImageUrl(item.BackdropItemId || item.Id, Object.assign(imageOptions, {
type: "Backdrop",
tag: imgTag,
maxWidth: getBackdropMaxWidth(),

2
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -583,7 +583,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
height = width && primaryImageAspectRatio ? Math.round(width / primaryImageAspectRatio) : null;
imgUrl = apiClient.getScaledImageUrl(item.Id || item.ItemId, {
imgUrl = apiClient.getScaledImageUrl(item.PrimaryImageItemId || item.Id || item.ItemId, {
type: "Primary",
maxHeight: height,
maxWidth: width,

14
dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js vendored
View file

@ -169,7 +169,7 @@
message = JSON.parse(message);
}
if (message.type == 'playbackerror') {
if (message.type === 'playbackerror') {
var errorCode = message.data;
@ -178,7 +178,7 @@
}, 300);
}
else if (message.type == 'connectionerror') {
else if (message.type === 'connectionerror') {
setTimeout(function () {
alertText(globalize.translate('MessageChromecastConnectionError'), globalize.translate('HeaderError'));
@ -399,11 +399,11 @@
console.log("chromecast new media session ID:" + mediaSession.mediaSessionId + ' (' + how + ')');
this.currentMediaSession = mediaSession;
if (how == 'loadMedia') {
if (how === 'loadMedia') {
this.castPlayerState = PLAYER_STATE.PLAYING;
}
if (how == 'activeSession') {
if (how === 'activeSession') {
this.castPlayerState = mediaSession.playerState;
}
@ -416,7 +416,7 @@
*/
CastPlayer.prototype.onMediaStatusUpdate = function (e) {
if (e == false) {
if (e === false) {
this.castPlayerState = PLAYER_STATE.IDLE;
}
console.log("chromecast updating media: " + e);
@ -476,7 +476,7 @@
var userId = ApiClient.getCurrentUserId();
if (query.Ids && query.Ids.split(',').length == 1) {
if (query.Ids && query.Ids.split(',').length === 1) {
return ApiClient.getItem(userId, query.Ids.split(',')).then(function (item) {
return {
Items: [item],
@ -901,7 +901,7 @@
self.tryPair = function (target) {
if (castPlayer.deviceState != DEVICE_STATE.ACTIVE && castPlayer.isInitialized) {
if (castPlayer.deviceState !== DEVICE_STATE.ACTIVE && castPlayer.isInitialized) {
return new Promise(function (resolve, reject) {
currentResolve = resolve;

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

@ -7,7 +7,7 @@ define([], function () {
var bottomItem = null;
var topText = nowPlayingItem.Name;
if (nowPlayingItem.AlbumId && nowPlayingItem.MediaType == 'Audio') {
if (nowPlayingItem.AlbumId && nowPlayingItem.MediaType === 'Audio') {
topItem = {
Id: nowPlayingItem.AlbumId,
Name: nowPlayingItem.Album,
@ -16,7 +16,7 @@ define([], function () {
};
}
if (nowPlayingItem.MediaType == 'Video') {
if (nowPlayingItem.MediaType === 'Video') {
if (nowPlayingItem.IndexNumber != null) {
topText = nowPlayingItem.IndexNumber + " - " + topText;
}

103
dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js vendored
View file

@ -336,7 +336,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
if (player && player.displayContent) {
player.displayContent(options);
}
}
};
self.sendCommand = function (cmd, player) {
@ -711,10 +711,13 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
}
};
self.playPause = function () {
if (currentPlayer) {
self.playPause = function (player) {
if (currentPlayer.paused()) {
player = player || currentPlayer;
if (player) {
if (player.paused()) {
self.unpause();
} else {
self.pause();
@ -722,22 +725,28 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
}
};
self.paused = function () {
self.paused = function (player) {
if (currentPlayer) {
return currentPlayer.paused();
player = player || currentPlayer;
if (player) {
return player.paused();
}
};
self.pause = function () {
if (currentPlayer) {
currentPlayer.pause();
self.pause = function (player) {
player = player || currentPlayer;
if (player) {
player.pause();
}
};
self.unpause = function () {
if (currentPlayer) {
currentPlayer.unpause();
self.unpause = function (player) {
player = player || currentPlayer;
if (player) {
player.unpause();
}
};
@ -1190,7 +1199,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
function getNowPlayingItemForReporting(player, item, mediaSource) {
var nowPlayingItem = {};
var nowPlayingItem = Object.assign({}, item);
if (mediaSource) {
nowPlayingItem.RunTimeTicks = mediaSource.RunTimeTicks;
@ -1198,72 +1207,6 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
nowPlayingItem.RunTimeTicks = player.duration() * 10000;
}
nowPlayingItem.Id = item.Id;
nowPlayingItem.MediaType = item.MediaType;
nowPlayingItem.Type = item.Type;
nowPlayingItem.Name = item.Name;
nowPlayingItem.IndexNumber = item.IndexNumber;
nowPlayingItem.IndexNumberEnd = item.IndexNumberEnd;
nowPlayingItem.ParentIndexNumber = item.ParentIndexNumber;
nowPlayingItem.ProductionYear = item.ProductionYear;
nowPlayingItem.PremiereDate = item.PremiereDate;
nowPlayingItem.SeriesName = item.SeriesName;
nowPlayingItem.Album = item.Album;
nowPlayingItem.AlbumId = item.AlbumId;
nowPlayingItem.Artists = item.Artists;
nowPlayingItem.ArtistItems = item.ArtistItems;
var imageTags = item.ImageTags || {};
if (item.SeriesPrimaryImageTag) {
nowPlayingItem.PrimaryImageItemId = item.SeriesId;
nowPlayingItem.PrimaryImageTag = item.SeriesPrimaryImageTag;
}
else if (imageTags.Primary) {
nowPlayingItem.PrimaryImageItemId = item.Id;
nowPlayingItem.PrimaryImageTag = imageTags.Primary;
}
else if (item.AlbumPrimaryImageTag) {
nowPlayingItem.PrimaryImageItemId = item.AlbumId;
nowPlayingItem.PrimaryImageTag = item.AlbumPrimaryImageTag;
}
else if (item.SeriesPrimaryImageTag) {
nowPlayingItem.PrimaryImageItemId = item.SeriesId;
nowPlayingItem.PrimaryImageTag = item.SeriesPrimaryImageTag;
}
if (item.BackdropImageTags && item.BackdropImageTags.length) {
nowPlayingItem.BackdropItemId = item.Id;
nowPlayingItem.BackdropImageTag = item.BackdropImageTags[0];
}
else if (item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
nowPlayingItem.BackdropItemId = item.ParentBackdropItemId;
nowPlayingItem.BackdropImageTag = item.ParentBackdropImageTags[0];
}
if (imageTags.Thumb) {
nowPlayingItem.ThumbItemId = item.Id;
nowPlayingItem.ThumbImageTag = imageTags.Thumb;
}
if (imageTags.Logo) {
nowPlayingItem.LogoItemId = item.Id;
nowPlayingItem.LogoImageTag = imageTags.Logo;
}
else if (item.ParentLogoImageTag) {
nowPlayingItem.LogoItemId = item.ParentLogoItemId;
nowPlayingItem.LogoImageTag = item.ParentLogoImageTag;
}
return nowPlayingItem;
}

18
dashboard-ui/bower_components/emby-webcomponents/sessionplayer.js vendored
View file

@ -85,7 +85,7 @@
self.canQueueMediaType = function (mediaType) {
return mediaType == 'Audio' || mediaType == 'Video';
return mediaType === 'Audio' || mediaType === 'Video';
};
self.stop = function () {
@ -182,7 +182,7 @@
// Update existing data
//updateSessionInfo(popup, msg.Data);
var session = sessions.filter(function (s) {
return s.Id == currentTargetId;
return s.Id === currentTargetId;
})[0];
if (session) {
@ -274,7 +274,7 @@
return apiClient.getSessions(sessionQuery).then(function (sessions) {
return sessions.filter(function (s) {
return s.DeviceId != apiClient.deviceId();
return s.DeviceId !== apiClient.deviceId();
}).map(function (s) {
return {
@ -326,7 +326,7 @@
// Update existing data
//updateSessionInfo(popup, msg.Data);
var session = sessions.filter(function (s) {
return s.Id == currentTargetId;
return s.Id === currentTargetId;
})[0];
if (session) {
@ -342,22 +342,22 @@
events.on(serverNotifications, 'SessionEnded', function (e, apiClient, data) {
console.log("Server reports another session ended");
if (playbackManager.getPlayerInfo().id == data.Id) {
if (playbackManager.getPlayerInfo().id === data.Id) {
playbackManager.setDefaultPlayerActive();
}
});
events.on(serverNotifications, 'PlaybackStart', function (e, apiClient, data) {
if (data.DeviceId != apiClient.deviceId()) {
if (playbackManager.getPlayerInfo().id == data.Id) {
if (data.DeviceId !== apiClient.deviceId()) {
if (playbackManager.getPlayerInfo().id === data.Id) {
firePlaybackEvent('playbackstart', data);
}
}
});
events.on(serverNotifications, 'PlaybackStopped', function (e, apiClient, data) {
if (data.DeviceId != apiClient.deviceId()) {
if (playbackManager.getPlayerInfo().id == data.Id) {
if (data.DeviceId !== apiClient.deviceId()) {
if (playbackManager.getPlayerInfo().id === data.Id) {
firePlaybackEvent('playbackstop', data);
}
}