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 controllers

Browse source
This commit is contained in:
dkanada 2020-01-12 02:24:54 +09:00
commit 19861962af
200 changed files with 5829 additions and 2799 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/auth/login.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>";

2
src/controllers/dashboard/dashboard.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;\">";

22
src/controllers/itemdetailpage.js
View file

@ -419,13 +419,13 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
var offset = parentNameLast ? ".25em" : ".5em";
if (html && !parentNameLast) {
html += '<h3 class="itemName" style="margin: .25em 0 .5em;">' + name + '</h3>';
html += '<h3 class="itemName infoText" style="margin: .25em 0 .5em;">' + name + '</h3>';
} else {
html = '<h1 class="itemName" style="margin: .1em 0 ' + offset + ';">' + name + "</h1>" + html;
html = '<h1 class="itemName infoText" style="margin: .1em 0 ' + offset + ';">' + name + "</h1>" + html;
}
if (item.OriginalTitle && item.OriginalTitle != item.Name) {
html += '<h4 class="itemName" style="margin: -' + offset + ' 0 0">' + item.OriginalTitle + '</h4>';
html += '<h4 class="itemName infoText" style="margin: -' + offset + ' 0 0">' + item.OriginalTitle + '</h4>';
}
container.innerHTML = html;
@ -801,10 +801,8 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
});
}
html += '<div style="position:relative;">';
if (editable) {
html += "<a class='itemDetailGalleryLink' is='emby-linkbutton' style='display:block;padding:2px;margin:0;' href='#'>";
html += "<a class='itemDetailGalleryLink' is='emby-linkbutton' style='display:block;margin:0;padding:0;' href='#'>";
}
if (detectRatio && item.PrimaryImageAspectRatio) {
@ -828,7 +826,6 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
html += progressHtml;
}
html += "</div>";
html += "</div>";
elem.innerHTML = html;
@ -898,7 +895,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
var html = cardBuilder.getCardsHtml({
items: result.Items,
shape: getThumbShape(false),
shape: "overflowBackdrop",
showTitle: true,
displayAsSpecial: "Season" == item.Type && item.IndexNumber,
overlayText: false,
@ -1274,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;
@ -1403,7 +1400,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
scrollX = enableScrollX();
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: getPortraitShape(),
shape: "overflowPortrait",
showTitle: true,
centerText: true,
lazy: true,
@ -1422,7 +1419,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
if ("Episode" === item.Type) {
html = cardBuilder.getCardsHtml({
items: result.Items,
shape: getThumbShape(scrollX),
shape: "overflowBackdrop",
showTitle: true,
displayAsSpecial: "Season" == item.Type && item.IndexNumber,
playFromHere: true,
@ -1740,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,
@ -1860,7 +1858,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
coverImage: true,
serverId: item.ServerId,
width: 160,
shape: getPortraitShape()
shape: "overflowPortrait"
});
});
}

11
src/controllers/playback/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) {
@ -789,6 +789,12 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
view.querySelector(".btnPip").classList.remove("hide");
}
if (-1 === supportedCommands.indexOf("AirPlay")) {
view.querySelector(".btnAirPlay").classList.add("hide");
} else {
view.querySelector(".btnAirPlay").classList.remove("hide");
}
updateFullscreenIcon();
}
@ -1306,6 +1312,9 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
view.querySelector(".btnPip").addEventListener("click", function () {
playbackManager.togglePictureInPicture(currentPlayer);
});
view.querySelector(".btnAirPlay").addEventListener("click", function () {
playbackManager.toggleAirPlay(currentPlayer);
});
view.querySelector(".btnVideoOsdSettings").addEventListener("click", onSettingsButtonClick);
view.addEventListener("viewhide", function () {
headerElement.classList.remove("hide");

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,