diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
index 4277100168..0b1363add5 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.js
+++ b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -24,6 +24,7 @@ import { appRouter } from '../appRouter';
let currentTimeElement;
let nowPlayingImageElement;
+ let nowPlayingImageUrl;
let nowPlayingTextElement;
let nowPlayingUserData;
let muteButton;
@@ -488,7 +489,6 @@ import { appRouter } from '../appRouter';
return null;
}
- let currentImgUrl;
function updateNowPlayingInfo(state) {
const nowPlayingItem = state.NowPlayingItem;
@@ -524,54 +524,46 @@ import { appRouter } from '../appRouter';
height: imgHeight
})) : null;
- let isRefreshing = false;
-
- if (url !== currentImgUrl) {
- currentImgUrl = url;
- isRefreshing = true;
-
- if (url) {
- imageLoader.lazyImage(nowPlayingImageElement, url);
- nowPlayingImageElement.style.display = null;
- nowPlayingTextElement.style.marginLeft = null;
- } else {
- nowPlayingImageElement.style.backgroundImage = '';
- nowPlayingImageElement.style.display = 'none';
- nowPlayingTextElement.style.marginLeft = '1em';
- }
+ if (url && url !== nowPlayingImageUrl) {
+ nowPlayingImageUrl = url;
+ imageLoader.lazyImage(nowPlayingImageElement, url);
+ nowPlayingImageElement.style.display = null;
+ nowPlayingTextElement.style.marginLeft = null;
+ } else {
+ nowPlayingImageElement.style.backgroundImage = '';
+ nowPlayingImageElement.style.display = 'none';
+ nowPlayingTextElement.style.marginLeft = '1em';
}
if (nowPlayingItem.Id) {
- if (isRefreshing) {
- const apiClient = ServerConnections.getApiClient(nowPlayingItem.ServerId);
- apiClient.getItem(apiClient.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {
- const userData = item.UserData || {};
- const likes = userData.Likes == null ? '' : userData.Likes;
- if (!layoutManager.mobile) {
- let contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu');
- // We remove the previous event listener by replacing the item in each update event
- const contextButtonClone = contextButton.cloneNode(true);
- contextButton.parentNode.replaceChild(contextButtonClone, contextButton);
- contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu');
- const options = {
- play: false,
- queue: false,
- stopPlayback: true,
- clearQueue: true,
- positionTo: contextButton
- };
- apiClient.getCurrentUser().then(function (user) {
- contextButton.addEventListener('click', function () {
- itemContextMenu.show(Object.assign({
- item: item,
- user: user
- }, options));
- });
+ const apiClient = ServerConnections.getApiClient(nowPlayingItem.ServerId);
+ apiClient.getItem(apiClient.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {
+ const userData = item.UserData || {};
+ const likes = userData.Likes == null ? '' : userData.Likes;
+ if (!layoutManager.mobile) {
+ let contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu');
+ // We remove the previous event listener by replacing the item in each update event
+ const contextButtonClone = contextButton.cloneNode(true);
+ contextButton.parentNode.replaceChild(contextButtonClone, contextButton);
+ contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu');
+ const options = {
+ play: false,
+ queue: false,
+ stopPlayback: true,
+ clearQueue: true,
+ positionTo: contextButton
+ };
+ apiClient.getCurrentUser().then(function (user) {
+ contextButton.addEventListener('click', function () {
+ itemContextMenu.show(Object.assign({
+ item: item,
+ user: user
+ }, options));
});
- }
- nowPlayingUserData.innerHTML = '';
- });
- }
+ });
+ }
+ nowPlayingUserData.innerHTML = '';
+ });
} else {
nowPlayingUserData.innerHTML = '';
}