milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into replace-unicode

Browse source 
# Conflicts:
#	src/components/guide/guide.js
#	src/components/mediainfo/mediainfo.js
#	src/components/multiselect/multiselect.js
#	src/components/playback/brightnessosd.js
#	src/components/recordingcreator/recordingbutton.js
#	src/components/userdatabuttons/emby-ratingbutton.js
#	src/controllers/favorites.js
This commit is contained in:
grafixeyehero 2019-11-24 17:45:48 +03:00
commit 080b3365d6
145 changed files with 1438 additions and 4767 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/scripts/librarymenu.js
View file

@ -25,11 +25,6 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
if (user && user.name) {
if (user.imageUrl) {
var url = user.imageUrl;
if (user.supportsImageParams) {
url += "&height=" + Math.round(26 * Math.max(window.devicePixelRatio || 1, 2));
}
updateHeaderUserButton(url);
hasImage = true;
}
@ -189,7 +184,6 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
html += "</div>";
}
// add buttons to navigation drawer
navDrawerScrollContainer.innerHTML = html;
// bind logout button click to method