\ No newline at end of file
diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index d1601ebac6..debf19a594 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -57,9 +57,8 @@
${LabelEnableBackdropsHelp}
diff --git a/dashboard-ui/scripts/autobackdrops.js b/dashboard-ui/scripts/autobackdrops.js
index 2ff2363d15..bd43edd650 100644
--- a/dashboard-ui/scripts/autobackdrops.js
+++ b/dashboard-ui/scripts/autobackdrops.js
@@ -1,16 +1,6 @@
define(['backdrop', 'appStorage'], function (backdrop, appStorage) {
'use strict';
- function isEnabledByDefault() {
-
- if (AppInfo.hasLowImageBandwidth) {
-
- return false;
- }
-
- return false;
- }
-
function enabled() {
var apiClient = window.ApiClient;
@@ -24,7 +14,7 @@
var val = appStorage.getItem('enableBackdrops-' + userId);
// For bandwidth
- return val == '1' || (val != '0' && isEnabledByDefault());
+ return val == '1';
}
var cache = {};
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 1bd77bb7a6..8779907e6b 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -1,4 +1,4 @@
-define(['layoutManager', 'cardBuilder', 'datetime', 'mediaInfo', 'backdrop', 'listView', 'itemContextMenu', 'itemHelper', 'userdataButtons', 'dom', 'indicators', 'apphost', 'imageLoader', 'libraryMenu', 'scrollStyles', 'emby-itemscontainer', 'emby-checkbox'], function (layoutManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, userdataButtons, dom, indicators, appHost, imageLoader, libraryMenu) {
+define(['layoutManager', 'cardBuilder', 'datetime', 'mediaInfo', 'backdrop', 'listView', 'itemContextMenu', 'itemHelper', 'userdataButtons', 'dom', 'indicators', 'apphost', 'imageLoader', 'libraryMenu', 'shell', 'globalize', 'scrollStyles', 'emby-itemscontainer', 'emby-checkbox'], function (layoutManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, userdataButtons, dom, indicators, appHost, imageLoader, libraryMenu, shell, globalize) {
'use strict';
var currentItem;
@@ -72,15 +72,14 @@
queue: false,
playAllFromHere: false,
queueAllFromHere: false,
- positionTo: button
+ positionTo: button,
+ cancelTimer: false,
+ record: false
};
if (appHost.supports('sync')) {
// Will be displayed via button
options.syncLocal = false;
- } else {
- // Will be displayed via button
- options.sync = false;
}
return options;
@@ -115,23 +114,14 @@
setInitialCollapsibleState(page, item, context, user);
renderDetails(page, item, context);
- var hasBackdrop = false;
+ var itemBackdropElement = page.querySelector('#itemBackdrop');
+ itemBackdropElement.classList.add('noBackdrop');
+ itemBackdropElement.style.backgroundImage = 'none';
+ backdrop.setBackdrops([item]);
- // For these types, make the backdrop a little smaller so that the items are more quickly accessible
- if (item.Type == 'MusicArtist' || item.Type == "MusicAlbum" || item.Type == "Playlist" || item.Type == "BoxSet" || item.MediaType == "Audio" || !layoutManager.mobile) {
- var itemBackdropElement = page.querySelector('#itemBackdrop');
- itemBackdropElement.classList.add('noBackdrop');
- itemBackdropElement.style.backgroundImage = 'none';
- backdrop.setBackdrops([item]);
- }
- else {
- hasBackdrop = LibraryBrowser.renderDetailPageBackdrop(page, item, imageLoader);
- backdrop.clear();
- }
+ LibraryBrowser.renderDetailPageBackdrop(page, item, imageLoader);
- var transparentHeader = hasBackdrop && page.classList.contains('noSecondaryNavPage');
-
- libraryMenu.setTransparentMenu(transparentHeader);
+ libraryMenu.setTransparentMenu(true);
var canPlay = false;
@@ -154,7 +144,7 @@
hideAll(page, 'btnPlay');
}
- if (item.LocalTrailerCount && item.PlayAccess == 'Full') {
+ if ((item.LocalTrailerCount || (item.RemoteTrailers && item.RemoteTrailers.length)) && item.PlayAccess == 'Full') {
hideAll(page, 'btnPlayTrailer', true);
} else {
hideAll(page, 'btnPlayTrailer');
@@ -176,20 +166,6 @@
showRecordingFields(page, item, user);
- var btnPlayExternalTrailer = page.querySelectorAll('.btnPlayExternalTrailer');
- for (var i = 0, length = btnPlayExternalTrailer.length; i < length; i++) {
- if (!item.LocalTrailerCount && item.RemoteTrailers.length && item.PlayAccess == 'Full') {
-
- btnPlayExternalTrailer[i].classList.remove('hide');
- btnPlayExternalTrailer[i].href = item.RemoteTrailers[0].Url;
-
- } else {
-
- btnPlayExternalTrailer[i].classList.add('hide');
- btnPlayExternalTrailer[i].href = '#';
- }
- }
-
var groupedVersions = (item.MediaSources || []).filter(function (g) {
return g.Type == "Grouping";
});
@@ -215,7 +191,7 @@
var birthday = datetime.parseISO8601Date(item.PremiereDate, true).toDateString();
itemBirthday.classList.remove('hide');
- itemBirthday.innerHTML = Globalize.translate('BirthDateValue').replace('{0}', birthday);
+ itemBirthday.innerHTML = globalize.translate('BirthDateValue').replace('{0}', birthday);
}
catch (err) {
itemBirthday.classList.add('hide');
@@ -231,7 +207,7 @@
var deathday = datetime.parseISO8601Date(item.EndDate, true).toDateString();
itemDeathDate.classList.remove('hide');
- itemDeathDate.innerHTML = Globalize.translate('DeathDateValue').replace('{0}', deathday);
+ itemDeathDate.innerHTML = globalize.translate('DeathDateValue').replace('{0}', deathday);
}
catch (err) {
itemDeathDate.classList.add('hide');
@@ -245,7 +221,7 @@
var gmap = '' + item.ProductionLocations[0] + '';
itemBirthLocation.classList.remove('hide');
- itemBirthLocation.innerHTML = Globalize.translate('BirthPlaceValue').replace('{0}', gmap);
+ itemBirthLocation.innerHTML = globalize.translate('BirthPlaceValue').replace('{0}', gmap);
} else {
itemBirthLocation.classList.add('hide');
}
@@ -322,7 +298,7 @@
var links = [];
if (item.HomePageUrl) {
- links.push('' + Globalize.translate('ButtonWebsite') + '');
+ links.push('' + globalize.translate('ButtonWebsite') + '');
}
if (item.ExternalUrls) {
@@ -337,9 +313,7 @@
if (links.length) {
- var html = links.join(' / ');
-
- html = Globalize.translate('ValueLinks', html);
+ var html = links.join('•');
linksElem.innerHTML = html;
linksElem.classList.remove('hide');
@@ -349,9 +323,34 @@
}
}
+ function shadeBlendConvert(p, from, to) {
+ if (typeof (p) != "number" || p < -1 || p > 1 || typeof (from) != "string" || (from[0] != 'r' && from[0] != '#') || (typeof (to) != "string" && typeof (to) != "undefined")) return null; //ErrorCheck
+
+ var sbcRip = function (d) {
+ var l = d.length, RGB = new Object();
+ if (l > 9) {
+ d = d.split(",");
+ if (d.length < 3 || d.length > 4) return null; //ErrorCheck
+ RGB[0] = i(d[0].slice(4)), RGB[1] = i(d[1]), RGB[2] = i(d[2]), RGB[3] = d[3] ? parseFloat(d[3]) : -1;
+ } else {
+ if (l == 8 || l == 6 || l < 4) return null; //ErrorCheck
+ if (l < 6) d = "#" + d[1] + d[1] + d[2] + d[2] + d[3] + d[3] + (l > 4 ? d[4] + "" + d[4] : ""); //3 digit
+ d = i(d.slice(1), 16), RGB[0] = d >> 16 & 255, RGB[1] = d >> 8 & 255, RGB[2] = d & 255, RGB[3] = l == 9 || l == 5 ? r(((d >> 24 & 255) / 255) * 10000) / 10000 : -1;
+ }
+ return RGB;
+ };
+
+ var i = parseInt, r = Math.round, h = from.length > 9, h = typeof (to) == "string" ? to.length > 9 ? true : to == "c" ? !h : false : h, b = p < 0, p = b ? p * -1 : p, to = to && to != "c" ? to : b ? "#000000" : "#FFFFFF", f = sbcRip(from), t = sbcRip(to);
+ if (!f || !t) return null; //ErrorCheck
+ if (h) return "rgb(" + r((t[0] - f[0]) * p + f[0]) + "," + r((t[1] - f[1]) * p + f[1]) + "," + r((t[2] - f[2]) * p + f[2]) + (f[3] < 0 && t[3] < 0 ? ")" : "," + (f[3] > -1 && t[3] > -1 ? r(((t[3] - f[3]) * p + f[3]) * 10000) / 10000 : t[3] < 0 ? f[3] : t[3]) + ")");
+ else return "#" + (0x100000000 + (f[3] > -1 && t[3] > -1 ? r(((t[3] - f[3]) * p + f[3]) * 255) : t[3] > -1 ? r(t[3] * 255) : f[3] > -1 ? r(f[3] * 255) : 255) * 0x1000000 + r((t[0] - f[0]) * p + f[0]) * 0x10000 + r((t[1] - f[1]) * p + f[1]) * 0x100 + r((t[2] - f[2]) * p + f[2])).toString(16).slice(f[3] > -1 || t[3] > -1 ? 1 : 3);
+ }
+
function renderImage(page, item, user) {
- LibraryBrowser.renderDetailImage(page.querySelector('.detailImageContainer'), item, user.Policy.IsAdministrator && item.MediaType != 'Photo', null, imageLoader, indicators);
+ var container = page.querySelector('.detailImageContainer');
+
+ LibraryBrowser.renderDetailImage(container, item, user.Policy.IsAdministrator && item.MediaType != 'Photo', null, imageLoader, indicators);
}
function refreshDetailImageUserData(elem, item) {
@@ -369,9 +368,9 @@
function setPeopleHeader(page, item) {
if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.MediaType == "Book" || item.MediaType == "Photo") {
- page.querySelector('#peopleHeader').innerHTML = Globalize.translate('HeaderPeople');
+ page.querySelector('#peopleHeader').innerHTML = globalize.translate('HeaderPeople');
} else {
- page.querySelector('#peopleHeader').innerHTML = Globalize.translate('HeaderCastAndCrew');
+ page.querySelector('#peopleHeader').innerHTML = globalize.translate('HeaderCastAndCrew');
}
}
@@ -519,7 +518,7 @@
if (overview) {
elem.innerHTML = overview;
- elem.classList.remove('empty');
+ elem.classList.remove('hide');
var anchors = elem.querySelectorAll('a');
for (var j = 0, length2 = anchors.length; j < length2; j++) {
@@ -529,7 +528,7 @@
} else {
elem.innerHTML = '';
- elem.classList.add('empty');
+ elem.classList.add('hide');
}
}
}
@@ -539,10 +538,6 @@
renderSimilarItems(page, item, context);
renderMoreFromItems(page, item);
- if (!isStatic) {
- renderSiblingLinks(page, item, context);
- }
-
var taglineElement = page.querySelector('.tagline');
if (item.Taglines && item.Taglines.length) {
@@ -552,30 +547,35 @@
taglineElement.classList.add('hide');
}
- var topOverview = page.querySelector('.topOverview');
- var bottomOverview = page.querySelector('.bottomOverview');
+ var overview = page.querySelector('.overview');
- var seasonOnBottom = screen.availHeight < 800 || screen.availWidth < 600;
-
- if (item.Type == 'MusicAlbum' || item.Type == 'MusicArtist' || (item.Type == 'Season' && seasonOnBottom)) {
- renderOverview([bottomOverview], item);
- topOverview.classList.add('hide');
- bottomOverview.classList.remove('hide');
- } else {
- renderOverview([topOverview], item);
- topOverview.classList.remove('hide');
- bottomOverview.classList.add('hide');
- }
+ renderOverview([overview], item);
renderAwardSummary(page.querySelector('#awardSummary'), item);
var i, length;
- var itemMiscInfo = page.querySelectorAll('.itemMiscInfo');
+ var itemMiscInfo = page.querySelectorAll('.itemMiscInfo-primary');
for (i = 0, length = itemMiscInfo.length; i < length; i++) {
mediaInfo.fillPrimaryMediaInfo(itemMiscInfo[i], item, {
interactive: true,
episodeTitle: false
});
+ if (itemMiscInfo[i].innerHTML) {
+ itemMiscInfo[i].classList.remove('hide');
+ } else {
+ itemMiscInfo[i].classList.add('hide');
+ }
+ }
+ itemMiscInfo = page.querySelectorAll('.itemMiscInfo-secondary');
+ for (i = 0, length = itemMiscInfo.length; i < length; i++) {
+ mediaInfo.fillSecondaryMediaInfo(itemMiscInfo[i], item, {
+ interactive: true
+ });
+ if (itemMiscInfo[i].innerHTML) {
+ itemMiscInfo[i].classList.remove('hide');
+ } else {
+ itemMiscInfo[i].classList.add('hide');
+ }
}
var itemGenres = page.querySelectorAll('.itemGenres');
for (i = 0, length = itemGenres.length; i < length; i++) {
@@ -600,13 +600,13 @@
renderSeriesAirTime(page, item, isStatic);
- var playersElement = page.querySelector('#players');
+ var dateAddedElement = page.querySelector('#dateAdded');
- if (item.Players) {
- playersElement.classList.remove('hide');
- playersElement.innerHTML = item.Players + ' Player';
+ if (!item.IsFolder) {
+ dateAddedElement.classList.remove('hide');
+ dateAddedElement.innerHTML = globalize.translate('DateAddedValue', datetime.toLocaleDateString(datetime.parseISO8601Date(item.DateCreated)));
} else {
- playersElement.classList.add('hide');
+ dateAddedElement.classList.add('hide');
}
var artist = page.querySelectorAll('.artist');
@@ -631,8 +631,6 @@
} else {
page.querySelector('.photoInfo').classList.add('hide');
}
-
- renderTabButtons(page, item);
}
function renderPhotoInfo(page, item) {
@@ -642,30 +640,30 @@
var attributes = [];
if (item.CameraMake) {
- attributes.push(createAttribute(Globalize.translate('MediaInfoCameraMake'), item.CameraMake));
+ attributes.push(createAttribute(globalize.translate('MediaInfoCameraMake'), item.CameraMake));
}
if (item.CameraModel) {
- attributes.push(createAttribute(Globalize.translate('MediaInfoCameraModel'), item.CameraModel));
+ attributes.push(createAttribute(globalize.translate('MediaInfoCameraModel'), item.CameraModel));
}
if (item.Altitude) {
- attributes.push(createAttribute(Globalize.translate('MediaInfoAltitude'), item.Altitude.toFixed(1)));
+ attributes.push(createAttribute(globalize.translate('MediaInfoAltitude'), item.Altitude.toFixed(1)));
}
if (item.Aperture) {
- attributes.push(createAttribute(Globalize.translate('MediaInfoAperture'), 'F' + item.Aperture.toFixed(1)));
+ attributes.push(createAttribute(globalize.translate('MediaInfoAperture'), 'F' + item.Aperture.toFixed(1)));
}
if (item.ExposureTime) {
var val = 1 / item.ExposureTime;
- attributes.push(createAttribute(Globalize.translate('MediaInfoExposureTime'), '1/' + val + ' s'));
+ attributes.push(createAttribute(globalize.translate('MediaInfoExposureTime'), '1/' + val + ' s'));
}
if (item.FocalLength) {
- attributes.push(createAttribute(Globalize.translate('MediaInfoFocalLength'), item.FocalLength.toFixed(1) + ' mm'));
+ attributes.push(createAttribute(globalize.translate('MediaInfoFocalLength'), item.FocalLength.toFixed(1) + ' mm'));
}
if (item.ImageOrientation) {
@@ -673,23 +671,23 @@
}
if (item.IsoSpeedRating) {
- attributes.push(createAttribute(Globalize.translate('MediaInfoIsoSpeedRating'), item.IsoSpeedRating));
+ attributes.push(createAttribute(globalize.translate('MediaInfoIsoSpeedRating'), item.IsoSpeedRating));
}
if (item.Latitude) {
- attributes.push(createAttribute(Globalize.translate('MediaInfoLatitude'), item.Latitude.toFixed(1)));
+ attributes.push(createAttribute(globalize.translate('MediaInfoLatitude'), item.Latitude.toFixed(1)));
}
if (item.Longitude) {
- attributes.push(createAttribute(Globalize.translate('MediaInfoLongitude'), item.Longitude.toFixed(1)));
+ attributes.push(createAttribute(globalize.translate('MediaInfoLongitude'), item.Longitude.toFixed(1)));
}
if (item.ShutterSpeed) {
- attributes.push(createAttribute(Globalize.translate('MediaInfoShutterSpeed'), item.ShutterSpeed));
+ attributes.push(createAttribute(globalize.translate('MediaInfoShutterSpeed'), item.ShutterSpeed));
}
if (item.Software) {
- attributes.push(createAttribute(Globalize.translate('MediaInfoSoftware'), item.Software));
+ attributes.push(createAttribute(globalize.translate('MediaInfoSoftware'), item.Software));
}
html += attributes.join(' ');
@@ -697,20 +695,6 @@
page.querySelector('.photoInfoContent').innerHTML = html;
}
- function renderTabButtons(page, item) {
-
- var elem = page.querySelector('.tabDetails');
- var text = elem.textContent || elem.innerText || '';
-
- if (text.trim()) {
-
- page.querySelector('.detailsSection').classList.remove('hide');
-
- } else {
- page.querySelector('.detailsSection').classList.add('hide');
- }
- }
-
function getArtistLinksHtml(artists, context) {
var html = [];
@@ -726,82 +710,15 @@
html = html.join(' / ');
if (artists.length == 1) {
- return Globalize.translate('ValueArtist', html);
+ return globalize.translate('ValueArtist', html);
}
if (artists.length > 1) {
- return Globalize.translate('ValueArtists', html);
+ return globalize.translate('ValueArtists', html);
}
return html;
}
- function renderSiblingLinks(page, item, context) {
-
- var lnkPreviousItem = page.querySelector('.lnkPreviousItem');
- var lnkNextItem = page.querySelector('.lnkNextItem');
-
- if ((item.Type != "Episode" && item.Type != "Season" && item.Type != "Audio" && item.Type != "Photo")) {
- lnkNextItem.classList.add('hide');
- lnkPreviousItem.classList.add('hide');
-
- return;
- }
-
- var promise;
-
- if (item.Type == "Season") {
-
- promise = ApiClient.getSeasons(item.SeriesId, {
-
- userId: Dashboard.getCurrentUserId(),
- AdjacentTo: item.Id
- });
- }
- else if (item.Type == "Episode" && item.SeasonId) {
-
- // Use dedicated episodes endpoint
- promise = ApiClient.getEpisodes(item.SeriesId, {
-
- seasonId: item.SeasonId,
- userId: Dashboard.getCurrentUserId(),
- AdjacentTo: item.Id
- });
-
- } else {
- promise = ApiClient.getItems(Dashboard.getCurrentUserId(), {
- AdjacentTo: item.Id,
- ParentId: item.ParentId,
- SortBy: 'SortName'
- });
- }
-
- context = context || '';
-
- promise.then(function (result) {
-
- var foundExisting = false;
-
- for (var i = 0, length = result.Items.length; i < length; i++) {
-
- var curr = result.Items[i];
-
- if (curr.Id == item.Id) {
- foundExisting = true;
- }
- else if (!foundExisting) {
-
- lnkPreviousItem.classList.remove('hide');
- lnkPreviousItem.href = 'itemdetails.html?id=' + curr.Id + '&context=' + context;
- }
- else {
-
- lnkNextItem.classList.remove('hide');
- lnkNextItem.href = 'itemdetails.html?id=' + curr.Id + '&context=' + context;
- }
- }
- });
- }
-
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts && screen.availWidth <= 1000;
}
@@ -856,7 +773,7 @@
}
moreFromSection.classList.remove('hide');
- moreFromSection.querySelector('.moreFromHeader').innerHTML = Globalize.translate('MoreFromValue', item.AlbumArtists[0].Name);
+ moreFromSection.querySelector('.moreFromHeader').innerHTML = globalize.translate('MoreFromValue', item.AlbumArtists[0].Name);
var html = '';
@@ -1016,7 +933,7 @@
if (item.Tags && item.Tags.length) {
var html = '';
- html += '
' + Globalize.translate('HeaderTags') + '
';
+ html += '
' + globalize.translate('HeaderTags') + '
';
for (var i = 0, length = item.Tags.length; i < length; i++) {
html += '