From 147fdec94593822543311aae8eef6b26a087f6bf Mon Sep 17 00:00:00 2001 From: Tim Hobbs Date: Wed, 14 May 2014 10:38:25 -0700 Subject: [PATCH 1/2] Fix for media player thumbs --- dashboard-ui/scripts/mediaplayer.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index c28434e844..2657eae22d 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -484,29 +484,29 @@ var url = ""; - if (state.primaryImageTag) { + if (state.NowPlayingItem.PrimaryImageTag) { - url = ApiClient.getImageUrl(state.primaryImageItemId, { + url = ApiClient.getImageUrl(state.NowPlayingItem.PrimaryImageItemId, { type: "Primary", height: 80, - tag: state.primaryImageTag + tag: state.NowPlayingItem.PrimaryImageTag }); } - else if (state.backdropImageTag) { + else if (state.NowPlayingItem.BackdropImageTag) { - url = ApiClient.getImageUrl(state.backdropItemId, { + url = ApiClient.getImageUrl(state.NowPlayingItem.BackdropItemId, { type: "Backdrop", height: 80, - tag: state.backdropImageTag, + tag: state.NowPlayingItem.BackdropImageTag, index: 0 }); - } else if (state.thumbImageTag) { + } else if (state.NowPlayingItem.ThumbImageTag) { - url = ApiClient.getImageUrl(state.thumbImageItemId, { + url = ApiClient.getImageUrl(state.NowPlayingItem.ThumbImageItemId, { type: "Thumb", height: 80, - tag: state.thumbImageTag + tag: state.NowPlayingItem.ThumbImageTag }); } @@ -520,6 +520,8 @@ url = "css/images/items/detail/video.png"; } + console.log("debug", state, url); + var nowPlayingTextElement = $('.nowPlayingText', mediaControls); var nameHtml = self.getNowPlayingNameHtml(state); From 42f65dfd986e57c5454c36c0dd471c79fd5286f5 Mon Sep 17 00:00:00 2001 From: Tim Hobbs Date: Wed, 14 May 2014 11:00:00 -0700 Subject: [PATCH 2/2] Remove logging --- dashboard-ui/scripts/mediaplayer.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 2657eae22d..3bd5507b6c 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -520,8 +520,6 @@ url = "css/images/items/detail/video.png"; } - console.log("debug", state, url); - var nowPlayingTextElement = $('.nowPlayingText', mediaControls); var nameHtml = self.getNowPlayingNameHtml(state);