From b049c42405ef68c9d1365d762face63b5d33e8ef Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 2 Jan 2017 14:43:31 -0500 Subject: [PATCH] update components --- .../emby-webcomponents/.bower.json | 8 +- .../emby-webcomponents/backdrop/backdrop.js | 2 +- .../cardbuilder/cardbuilder.js | 2 +- .../emby-webcomponents/chromecastplayer.js | 14 +-- .../playback/nowplayinghelper.js | 4 +- .../playback/playbackmanager.js | 105 ++++-------------- .../emby-webcomponents/sessionplayer.js | 18 +-- 7 files changed, 48 insertions(+), 105 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 0496ab5631..0bb38e3633 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -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", diff --git a/dashboard-ui/bower_components/emby-webcomponents/backdrop/backdrop.js b/dashboard-ui/bower_components/emby-webcomponents/backdrop/backdrop.js index 3c5121a408..fc9d74458c 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/backdrop/backdrop.js +++ b/dashboard-ui/bower_components/emby-webcomponents/backdrop/backdrop.js @@ -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(), diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index b92d051bb1..9070b92504 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -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, diff --git a/dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js b/dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js index c6d2bc41ed..366d66b275 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js +++ b/dashboard-ui/bower_components/emby-webcomponents/chromecastplayer.js @@ -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; diff --git a/dashboard-ui/bower_components/emby-webcomponents/playback/nowplayinghelper.js b/dashboard-ui/bower_components/emby-webcomponents/playback/nowplayinghelper.js index 72f2023d63..dbb9c45efa 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/playback/nowplayinghelper.js +++ b/dashboard-ui/bower_components/emby-webcomponents/playback/nowplayinghelper.js @@ -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; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js b/dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js index 296c063d03..834c5cc248 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js +++ b/dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js @@ -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; } @@ -2427,7 +2370,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g } function initLegacyVolumeMethods(player) { - player.getVolume = function() { + player.getVolume = function () { return player.volume(); }; player.setVolume = function (val) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/sessionplayer.js b/dashboard-ui/bower_components/emby-webcomponents/sessionplayer.js index 82fec2c8a3..15e753bf4f 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/sessionplayer.js +++ b/dashboard-ui/bower_components/emby-webcomponents/sessionplayer.js @@ -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); } }