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

merge branch master into itemdetailpage-layout

Browse source
This commit is contained in:
dkanada 2020-01-08 22:02:01 +09:00
commit bd097773b0
221 changed files with 6930 additions and 2952 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/dashboardpage.js
View file

@ -623,7 +623,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
}
},
getClientImage: function (connection) {
var iconUrl = imageHelper.getDeviceIcon(connection.DeviceName);
var iconUrl = imageHelper.getDeviceIcon(connection);
return "<img src='" + iconUrl + "' />";
},
getNowPlayingImageUrl: function (item) {

2
src/controllers/devices.js
View file

@ -74,7 +74,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu
deviceHtml += '<div class="cardScalable">';
deviceHtml += '<div class="cardPadder cardPadder-backdrop"></div>';
deviceHtml += '<a is="emby-linkbutton" href="' + (canEdit ? "device.html?id=" + device.Id : "#") + '" class="cardContent cardImageContainer">';
var iconUrl = imageHelper.getDeviceIcon(device.Name);
var iconUrl = imageHelper.getDeviceIcon(device);
if (iconUrl) {
deviceHtml += '<div class="cardImage" style="background-image:url(\'' + iconUrl + "');background-size: auto 64%;background-position:center center;\">";

3
src/controllers/itemdetailpage.js
View file

@ -1271,7 +1271,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
coverImage: "MusicAlbum" == item.Type || "MusicArtist" == item.Type,
overlayPlayButton: true,
overlayText: false,
showYear: "Movie" === item.Type || "Trailer" === item.Type
showYear: "Movie" === item.Type || "Trailer" === item.Type || "Series" === item.Type
});
var similarContent = similarCollapsible.querySelector(".similarContent");
similarContent.innerHTML = html;
@ -1737,6 +1737,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
items: items,
shape: shape,
showTitle: true,
showYear: "Video" === type.mediaType || "Series" === type.type,
centerText: true,
lazy: true,
showDetailsMenu: true,

2
src/controllers/loginpage.js
View file

@ -92,7 +92,7 @@ define(["apphost", "appSettings", "dom", "connectionManager", "loading", "layout
html += '<div class="cardImageContainer coveredImage coveredImage-noScale" style="background-image:url(\'' + imgUrl + "');\"></div>";
} else {
var background = getMetroColor(user.Id);
imgUrl = "img/logindefault.png";
imgUrl = "assets/img/avatar.png";
html += '<div class="cardImageContainer coveredImage coveredImage-noScale" style="background-image:url(\'' + imgUrl + "');background-color:" + background + ';"></div>';
}
html += "</div>";

3
src/controllers/music/musicalbums.js
View file

@ -241,6 +241,9 @@ define(["layoutManager", "playbackManager", "loading", "events", "libraryBrowser
}, {
name: Globalize.translate("OptionReleaseDate"),
id: "ProductionYear,PremiereDate,SortName"
}, {
name: Globalize.translate("OptionRandom"),
id: "Random,SortName"
}],
callback: function () {
getQuery().StartIndex = 0;

2
src/controllers/user/profile.js
View file

@ -8,7 +8,7 @@ define(["controllers/userpasswordpage", "loading", "libraryMenu", "apphost", "em
page.querySelector(".username").innerHTML = user.Name;
libraryMenu.setTitle(user.Name);
var imageUrl = "img/logindefault.png";
var imageUrl = "assets/img/avatar.png";
if (user.PrimaryImageTag) {
imageUrl = ApiClient.getUserImageUrl(user.Id, {
tag: user.PrimaryImageTag,

4
src/controllers/videoosd.js
View file

@ -1,4 +1,4 @@
define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "mediaInfo", "focusManager", "imageLoader", "scrollHelper", "events", "connectionManager", "browser", "globalize", "apphost", "layoutManager", "userSettings", "scrollStyles", "emby-slider", "paper-icon-button-light", "css!css/videoosd"], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost, layoutManager, userSettings) {
define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "mediaInfo", "focusManager", "imageLoader", "scrollHelper", "events", "connectionManager", "browser", "globalize", "apphost", "layoutManager", "userSettings", "scrollStyles", "emby-slider", "paper-icon-button-light", "css!assets/css/videoosd"], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost, layoutManager, userSettings) {
"use strict";
function seriesImageUrl(item, options) {
@ -402,6 +402,8 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
function onHideAnimationComplete(e) {
var elem = e.target;
if (elem != osdBottomElement)
return;
elem.classList.add("hide");
dom.removeEventListener(elem, transitionEndEventName, onHideAnimationComplete, {
once: true