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

fixes #1304 - Wrong profile picture

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-25 21:28:35 -05:00
parent dc8f4dc1f9
commit dec659a235
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
dashboard-ui/scripts/librarymenu.js
View file

@ -66,14 +66,14 @@
} }
} }
function addUserToHeader(user) { function updateUserInHeader(user) {
var header = document.querySelector('.viewMenuBar'); var header = document.querySelector('.viewMenuBar');
var headerUserButton = header.querySelector('.headerUserButton'); var headerUserButton = header.querySelector('.headerUserButton');
var hasImage; var hasImage;
if (user.name) { if (user && user.name) {
if (user.imageUrl && AppInfo.enableUserImage) { if (user.imageUrl && AppInfo.enableUserImage) {
var userButtonHeight = 26; var userButtonHeight = 26;
@ -93,13 +93,21 @@
} }
} }
if (hasUserButton && !hasImage) { if (headerUserButton && !hasImage) {
headerUserButton.icon = 'person'; headerUserButton.icon = 'person';
headerUserButton.src = null; headerUserButton.src = null;
headerUserButton.classList.remove('headerUserButtonRound'); headerUserButton.classList.remove('headerUserButtonRound');
// Looks like a bug in paper-icon-button that this doesn't get removed
var headerUserButtonImg = headerUserButton.querySelector('img');
if (headerUserButtonImg) {
headerUserButtonImg.parentNode.removeChild(headerUserButtonImg);
}
}
if (user) {
updateLocalUser(user.localUser);
} }
updateLocalUser(user.localUser);
requiresUserRefresh = false; requiresUserRefresh = false;
} }
@ -149,11 +157,6 @@
} }
} }
function removeUserFromHeader() {
updateLocalUser(null);
}
function bindMenuEvents() { function bindMenuEvents() {
var mainDrawerButton = document.querySelector('.mainDrawerButton'); var mainDrawerButton = document.querySelector('.mainDrawerButton');
@ -788,7 +791,7 @@
} }
if (requiresUserRefresh) { if (requiresUserRefresh) {
ConnectionManager.user(window.ApiClient).then(addUserToHeader); ConnectionManager.user(window.ApiClient).then(updateUserInHeader);
} }
} }
@ -947,13 +950,13 @@
Events.on(ConnectionManager, 'localusersignedin', function (e, user) { Events.on(ConnectionManager, 'localusersignedin', function (e, user) {
requiresLibraryMenuRefresh = true; requiresLibraryMenuRefresh = true;
requiresDrawerRefresh = true; requiresDrawerRefresh = true;
ConnectionManager.user(ConnectionManager.getApiClient(user.ServerId)).then(addUserToHeader); ConnectionManager.user(ConnectionManager.getApiClient(user.ServerId)).then(updateUserInHeader);
}); });
Events.on(ConnectionManager, 'localusersignedout', function () { Events.on(ConnectionManager, 'localusersignedout', function () {
requiresLibraryMenuRefresh = true; requiresLibraryMenuRefresh = true;
requiresDrawerRefresh = true; requiresDrawerRefresh = true;
removeUserFromHeader(); updateUserInHeader();
}); });
Events.on(MediaController, 'playerchange', function () { Events.on(MediaController, 'playerchange', function () {