From 1a9432b6423d5216b648b0fe3ae7625483bb9c23 Mon Sep 17 00:00:00 2001
From: Daniel Hartung <22015466+dhartung@users.noreply.github.com>
Date: Wed, 11 Sep 2019 17:59:00 +0200
Subject: [PATCH 1/5] Added original (native) title
---
src/controllers/itemdetailpage.js | 18 +++++++++++++++++-
src/itemdetails.html | 4 ++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js
index e46a1d226e..e6e3a5a022 100644
--- a/src/controllers/itemdetailpage.js
+++ b/src/controllers/itemdetailpage.js
@@ -235,7 +235,23 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
var name = itemHelper.getDisplayName(item, {
includeParentInfo: !1
});
- html && !parentNameLast ? html += '' + name + "
" : html = parentNameLast ? '' + name + "
" + html : '' + name + "
" + html, container.innerHTML = html, html.length ? container.classList.remove("hide") : container.classList.add("hide")
+
+ if (html && !parentNameLast) {
+ html += '' + name + '
';
+ } else {
+ if (parentNameLast) {
+ html = '' + name + "
" + html;
+ } else {
+ html = '' + name + "
" + html;
+ }
+ }
+
+ if (item.OriginalTitle) {
+ html += '' + item.OriginalTitle + '
';
+ }
+
+ container.innerHTML = html;
+ html.length ? container.classList.remove("hide") : container.classList.add("hide")
}
function setTrailerButtonVisibility(page, item) {
diff --git a/src/itemdetails.html b/src/itemdetails.html
index 45e4a40dff..0da8254c48 100644
--- a/src/itemdetails.html
+++ b/src/itemdetails.html
@@ -30,6 +30,10 @@
+
+
+
+
From ebbd3f11ab517a34f836537dfdaf5097d3ac6e6a Mon Sep 17 00:00:00 2001
From: Daniel Hartung <22015466+dhartung@users.noreply.github.com>
Date: Wed, 11 Sep 2019 18:19:17 +0200
Subject: [PATCH 2/5] Styling tweaks
---
src/controllers/itemdetailpage.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js
index e6e3a5a022..2a0ec3bee7 100644
--- a/src/controllers/itemdetailpage.js
+++ b/src/controllers/itemdetailpage.js
@@ -246,8 +246,8 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
}
}
- if (item.OriginalTitle) {
- html += '' + item.OriginalTitle + '
';
+ if (item.OriginalTitle && item.OriginalTitle != item.Name) {
+ html += '' + item.OriginalTitle + '
';
}
container.innerHTML = html;
From f8d894b269cce5e4f1d239e6128e332de60fecbe Mon Sep 17 00:00:00 2001
From: Daniel Hartung <22015466+dhartung@users.noreply.github.com>
Date: Wed, 11 Sep 2019 18:29:52 +0200
Subject: [PATCH 3/5] Simplification and style fix
---
src/controllers/itemdetailpage.js | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js
index 2a0ec3bee7..3dcfc39c21 100644
--- a/src/controllers/itemdetailpage.js
+++ b/src/controllers/itemdetailpage.js
@@ -236,18 +236,15 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
includeParentInfo: !1
});
+ var offset = parentNameLast ? ".25em" : ".5em";
if (html && !parentNameLast) {
html += '' + name + '
';
} else {
- if (parentNameLast) {
- html = '' + name + "
" + html;
- } else {
- html = '' + name + "
" + html;
- }
+ html = '' + name + "
" + html;
}
if (item.OriginalTitle && item.OriginalTitle != item.Name) {
- html += '' + item.OriginalTitle + '
';
+ html += '' + item.OriginalTitle + '
';
}
container.innerHTML = html;
From 8ee530c0ec01907c0040c6718807f4fc0fe00aee Mon Sep 17 00:00:00 2001
From: Daniel Hartung <22015466+dhartung@users.noreply.github.com>
Date: Wed, 11 Sep 2019 18:47:39 +0200
Subject: [PATCH 4/5] Expanded minified javascript
---
src/controllers/itemdetailpage.js | 71 ++++++++++++++++++++++++-------
1 file changed, 56 insertions(+), 15 deletions(-)
diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js
index 3dcfc39c21..22f3d331b3 100644
--- a/src/controllers/itemdetailpage.js
+++ b/src/controllers/itemdetailpage.js
@@ -544,22 +544,63 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
}
function renderDetails(page, item, apiClient, context, isStatic) {
- renderSimilarItems(page, item, context), renderMoreFromSeason(page, item, apiClient), renderMoreFromArtist(page, item, apiClient), renderDirector(page, item, apiClient, context, isStatic), renderGenres(page, item, apiClient, context, isStatic), renderChannelGuide(page, apiClient, item);
+ renderSimilarItems(page, item, context);
+ renderMoreFromSeason(page, item, apiClient);
+ renderMoreFromArtist(page, item, apiClient);
+ renderDirector(page, item, apiClient, context, isStatic);
+ renderGenres(page, item, apiClient, context, isStatic);
+ renderChannelGuide(page, apiClient, item);
+
var taglineElement = page.querySelector(".tagline");
- item.Taglines && item.Taglines.length ? (taglineElement.classList.remove("hide"), taglineElement.innerHTML = item.Taglines[0]) : taglineElement.classList.add("hide");
- var overview = page.querySelector(".overview"),
- externalLinksElem = page.querySelector(".itemExternalLinks");
- "Season" !== item.Type && "MusicAlbum" !== item.Type && "MusicArtist" !== item.Type || (overview.classList.add("detailsHiddenOnMobile"), externalLinksElem.classList.add("detailsHiddenOnMobile")), renderOverview([overview], item);
- var i, length, itemMiscInfo = page.querySelectorAll(".itemMiscInfo-primary");
- for (i = 0, length = itemMiscInfo.length; i < length; i++) mediaInfo.fillPrimaryMediaInfo(itemMiscInfo[i], item, {
- interactive: !0,
- episodeTitle: !1,
- subtitles: !1
- }), itemMiscInfo[i].innerHTML && "SeriesTimer" !== item.Type ? itemMiscInfo[i].classList.remove("hide") : itemMiscInfo[i].classList.add("hide");
- for (itemMiscInfo = page.querySelectorAll(".itemMiscInfo-secondary"), i = 0, length = itemMiscInfo.length; i < length; i++) mediaInfo.fillSecondaryMediaInfo(itemMiscInfo[i], item, {
- interactive: !0
- }), itemMiscInfo[i].innerHTML ? itemMiscInfo[i].classList.remove("hide") : itemMiscInfo[i].classList.add("hide");
- reloadUserDataButtons(page, item), renderLinks(externalLinksElem, item), renderTags(page, item), renderSeriesAirTime(page, item, isStatic)
+ if (item.Taglines && item.Taglines.length) {
+ taglineElement.classList.remove("hide");
+ taglineElement.innerHTML = item.Taglines[0];
+ } else {
+ taglineElement.classList.add("hide");
+ }
+
+ var overview = page.querySelector(".overview");
+ var externalLinksElem = page.querySelector(".itemExternalLinks");
+
+ if ("Season" !== item.Type && "MusicAlbum" !== item.Type && "MusicArtist" !== item.Type) {
+ overview.classList.add("detailsHiddenOnMobile");
+ externalLinksElem.classList.add("detailsHiddenOnMobile");
+ }
+ renderOverview([overview], item);
+
+ var i, itemMiscInfo;
+ itemMiscInfo = page.querySelectorAll(".itemMiscInfo-primary");
+ for (i = 0; i < itemMiscInfo.length; i++) {
+ mediaInfo.fillPrimaryMediaInfo(itemMiscInfo[i], item, {
+ interactive: !0,
+ episodeTitle: !1,
+ subtitles: !1
+ });
+
+ if (itemMiscInfo[i].innerHTML && "SeriesTimer" !== item.Type) {
+ itemMiscInfo[i].classList.remove("hide");
+ } else {
+ itemMiscInfo[i].classList.add("hide");
+ }
+ }
+
+ itemMiscInfo = page.querySelectorAll(".itemMiscInfo-secondary")
+ for (i = 0; i < itemMiscInfo.length; i++) {
+ mediaInfo.fillSecondaryMediaInfo(itemMiscInfo[i], item, {
+ interactive: !0
+ })
+
+ if (itemMiscInfo[i].innerHTML && "SeriesTimer" !== item.Type) {
+ itemMiscInfo[i].classList.remove("hide");
+ } else {
+ itemMiscInfo[i].classList.add("hide");
+ }
+ }
+
+ reloadUserDataButtons(page, item);
+ renderLinks(externalLinksElem, item);
+ renderTags(page, item);
+ renderSeriesAirTime(page, item, isStatic)
}
function enableScrollX() {
From f7d5d4480d82344a5c617f0a40423c0e07071862 Mon Sep 17 00:00:00 2001
From: Daniel Hartung <22015466+dhartung@users.noreply.github.com>
Date: Wed, 11 Sep 2019 19:58:31 +0200
Subject: [PATCH 5/5] Added last played information
---
src/controllers/itemdetailpage.js | 13 +++++++++++++
src/itemdetails.html | 2 ++
2 files changed, 15 insertions(+)
diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js
index 22f3d331b3..cd701a481a 100644
--- a/src/controllers/itemdetailpage.js
+++ b/src/controllers/itemdetailpage.js
@@ -393,6 +393,18 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
}
}
+ function renderUserInfo(page, item) {
+ var lastPlayedElement = page.querySelector(".itemLastPlayed");
+
+ if (item.UserData && item.UserData.LastPlayedDate) {
+ lastPlayedElement.classList.remove("hide");
+ var datePlayed = datetime.parseISO8601Date(item.UserData.LastPlayedDate);
+ lastPlayedElement.innerHTML = globalize.translate("DatePlayed") + " " + datetime.toLocaleDateString(datePlayed) + " " + datetime.getDisplayTime(datePlayed);
+ } else {
+ lastPlayedElement.classList.add("hide");
+ }
+ }
+
function renderLinks(linksElem, item) {
var html = [];
if (item.DateCreated && itemHelper.enableDateAddedDisplay(item)) {
@@ -599,6 +611,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
reloadUserDataButtons(page, item);
renderLinks(externalLinksElem, item);
+ renderUserInfo(page, item);
renderTags(page, item);
renderSeriesAirTime(page, item, isStatic)
}
diff --git a/src/itemdetails.html b/src/itemdetails.html
index 0da8254c48..1af02d2395 100644
--- a/src/itemdetails.html
+++ b/src/itemdetails.html
@@ -195,6 +195,7 @@