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

fix recording icons

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-13 23:19:05 -05:00
parent a919223fb2
commit 663412b891
14 changed files with 100 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/scripts/appsettings.js
View file

@ -95,7 +95,7 @@
update('displayLanguage', val);
}
return appStorage.getItem('displayLanguage') || 'en-US';
return appStorage.getItem('displayLanguage') || navigator.language || navigator.userLanguage || 'en-US';
},
cameraUploadServers: function (val) {

9
dashboard-ui/scripts/favorites.js
View file

@ -38,7 +38,6 @@
SortBy: "SortName",
SortOrder: "Ascending",
Filters: "IsFavorite",
Limit: screenWidth >= 1920 ? 10 : (screenWidth >= 1440 ? 8 : 6),
Recursive: true,
Fields: "PrimaryImageAspectRatio,SyncInfo",
CollapseBoxSetItems: false,
@ -49,8 +48,12 @@
options.ParentId = topParentId;
}
if (isSingleSection) {
options.Limit = null;
if (!isSingleSection) {
options.Limit = screenWidth >= 1920 ? 10 : (screenWidth >= 1440 ? 8 : 6);
if (enableScrollX()) {
options.Limit = 12;
}
}
var promise;

28
dashboard-ui/scripts/globalize.js
View file

@ -76,38 +76,36 @@
function getDeviceCulture() {
var deferred = DeferredBuilder.Deferred();
var culture;
if (navigator.globalization && navigator.globalization.getPreferredLanguage) {
if (navigator.globalization && navigator.globalization.getLocaleName) {
Logger.log('Calling navigator.globalization.getPreferredLanguage');
Logger.log('Calling navigator.globalization.getLocaleName');
navigator.globalization.getPreferredLanguage(function (locale) {
navigator.globalization.getLocaleName(function (locale) {
culture = normalizeLocaleName(locale.value || '');
var culture = locale.value || '';
//if ($.browser.safari) {
culture = navigator.language || navigator.userLanguage || culture;
//}
Logger.log('Device culture is ' + culture);
deferred.resolveWith(null, [culture]);
}, function () {
Logger.log('navigator.globalization.getLocaleName failed');
Logger.log('navigator.globalization.getPreferredLanguage failed');
deferred.resolveWith(null, [null]);
deferred.resolveWith(null, [navigator.language || navigator.userLanguage]);
});
} else if (AppInfo.supportsUserDisplayLanguageSetting) {
Logger.log('AppInfo.supportsUserDisplayLanguageSetting is true');
culture = AppSettings.displayLanguage();
deferred.resolveWith(null, [culture]);
deferred.resolveWith(null, [AppSettings.displayLanguage()]);
} else {
Logger.log('Getting culture from document');
culture = document.documentElement.getAttribute('data-culture');
deferred.resolveWith(null, [culture]);
deferred.resolveWith(null, [document.documentElement.getAttribute('data-culture')]);
}
return deferred.promise();
@ -122,9 +120,7 @@
getDeviceCulture().done(function (culture) {
if (!culture) {
culture = 'en-US';
}
culture = normalizeLocaleName(culture || 'en-US');
setCulture(culture).done(function () {
deferred.resolve();

24
dashboard-ui/scripts/itemdetailpage.js
View file

@ -391,7 +391,12 @@
}
renderThemeMedia(page, item, user);
renderCriticReviews(page, item, 1);
if (enableScrollX()) {
renderCriticReviews(page, item);
} else {
renderCriticReviews(page, item, 1);
}
}
function renderDetails(page, item, context, isStatic) {
@ -1127,14 +1132,11 @@
var reviews = result.Items;
if (reviews.length) {
html += '<div class="paperList">';
}
for (var i = 0, length = reviews.length; i < length; i++) {
var review = reviews[i];
html += '<div class="paperList">';
html += '<paper-icon-item style="padding-top:.5em;padding-bottom:.5em;">';
if (review.Score != null) {
@ -1185,8 +1187,6 @@
html += '</paper-item-body>';
html += '</paper-icon-item>';
}
if (reviews.length) {
html += '</div>';
}
@ -1196,6 +1196,12 @@
var criticReviewsContent = page.querySelector('#criticReviewsContent');
criticReviewsContent.innerHTML = html;
if (enableScrollX()) {
criticReviewsContent.classList.add('hiddenScrollX');
} else {
criticReviewsContent.classList.remove('hiddenScrollX');
}
}
function renderThemeMedia(page, item) {
@ -1711,6 +1717,10 @@
return c.PrimaryImageTag;
});
if (!casts.length) {
casts = item.People || [];
}
for (var i = 0, length = casts.length; i < length; i++) {
var cast = casts[i];

2
dashboard-ui/scripts/librarybrowser.js
View file

@ -1775,7 +1775,7 @@
var showTitle = options.showTitle == 'auto' ? true : options.showTitle;
var coverImage = options.coverImage;
if (options.autoThumb && item.ImageTags && item.ImageTags.Primary && item.PrimaryImageAspectRatio && item.PrimaryImageAspectRatio >= 1.5) {
if (options.autoThumb && item.ImageTags && item.ImageTags.Primary && item.PrimaryImageAspectRatio && item.PrimaryImageAspectRatio >= 1.34) {
width = posterWidth;
height = primaryImageAspectRatio ? Math.round(posterWidth / primaryImageAspectRatio) : null;