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

update image sizes

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-12 09:58:03 -04:00
parent 589ad2de70
commit 16f30944f8
7 changed files with 260 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dashboard-ui/scripts/dashboardpage.js
View file

@ -590,10 +590,10 @@
getClientImage: function (connection) {
var clientLowered = connection.Client.toLowerCase();
var device = connection.DeviceName.toLowerCase();
if (clientLowered == "dashboard" || clientLowered == "emby web client" || clientLowered == "emby mobile") {
var device = connection.DeviceName.toLowerCase();
if (clientLowered == "dashboard" || clientLowered == "emby web client") {
var imgUrl;
@ -615,6 +615,19 @@
return "<img src='" + imgUrl + "' alt='Emby Web Client' />";
}
if (clientLowered == "emby mobile") {
var imgUrl;
if (device.indexOf('iphone') != -1 || device.indexOf('ipad') != -1) {
imgUrl = 'css/images/clients/ios.png';
}
else {
imgUrl = 'css/images/clients/html5.png';
}
return "<img src='" + imgUrl + "' alt='Emby Web Client' />";
}
if (clientLowered == "mb-classic") {
return "<img src='css/images/clients/mbc.png' />";

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

@ -282,7 +282,7 @@
items: result.Items,
preferThumb: true,
shape: 'backdrop',
overlayText: screenWidth >= 600 && !AppInfo.hasLowImageBandwidth,
overlayText: screenWidth >= 800 && !AppInfo.hasLowImageBandwidth,
showTitle: true,
showParentTitle: true,
context: 'home',

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

@ -1070,18 +1070,16 @@
var html = "";
var primaryImageAspectRatio;
var primaryImageAspectRatio = LibraryBrowser.getAveragePrimaryImageAspectRatio(items);
var isThumbAspectRatio = primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.777777778) < .3;
var isSquareAspectRatio = primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1) < .33 ||
primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.3333334) < .01;
if (options.shape == 'auto' || options.shape == 'autohome') {
primaryImageAspectRatio = LibraryBrowser.getAveragePrimaryImageAspectRatio(items);
if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.777777778) < .3) {
if (isThumbAspectRatio) {
options.shape = options.shape == 'auto' ? 'backdrop' : 'backdrop';
} else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1) < .33) {
options.coverImage = true;
options.shape = 'square';
} else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.3333334) < .01) {
} else if (isSquareAspectRatio) {
options.coverImage = true;
options.shape = 'square';
} else if (primaryImageAspectRatio && primaryImageAspectRatio > 1.9) {
@ -1101,18 +1099,34 @@
var squareSize = posterInfo.squareSize;
var bannerWidth = posterInfo.bannerWidth;
if (isThumbAspectRatio) {
posterInfo.smallPosterWidth = posterInfo.smallThumbWidth;
posterWidth = thumbWidth;
}
else if (isSquareAspectRatio) {
posterInfo.smallPosterWidth = posterInfo.smallSquareSize;
posterWidth = squareSize;
}
if (options.shape == 'backdrop' && posterInfo.defaultThumb == 'smallBackdrop') {
options.shape = 'smallBackdrop';
thumbWidth = posterInfo.smallThumbWidth;
}
else if (options.shape == 'portrait' && posterInfo.defaultPortait == 'smallPortrait') {
options.shape = 'smallPortrait';
posterWidth = posterInfo.smallPosterWidth;
}
else if (options.shape == 'square' && posterInfo.defaultSquare == 'smallSquare') {
options.shape = 'smallSquare';
}
if (options.shape == 'smallBackdrop') {
thumbWidth = posterInfo.smallThumbWidth;
}
else if (options.shape == 'smallPortrait') {
posterWidth = posterInfo.smallPosterWidth;
}
else if (options.shape == 'smallSquare') {
squareSize = posterInfo.smallSquareSize;
}
else if (options.shape == 'detailPagePortrait') {

47
dashboard-ui/scripts/site.js
View file

@ -1373,7 +1373,7 @@ var Dashboard = {
return quality;
},
normalizeImageOptions: function(options) {
normalizeImageOptions: function (options) {
if (AppInfo.hasLowImageBandwidth) {
@ -1421,45 +1421,22 @@ var Dashboard = {
if (Dashboard.isRunningInCordova()) {
if ($.browser.safari) {
appName = "iOS";
if ($.browser.iphone) {
deviceName = 'iPhone';
} else if ($.browser.ipad) {
deviceName = 'iPad';
}
} else {
appName = "Android";
}
deviceName = store.getItem('cordovaDeviceName');
deviceId = store.getItem('cordovaDeviceId');
}
deviceName = deviceName || generateDeviceName();
// Cordova
//if (window.device) {
var seed = [];
var keyName = 'randomId';
// deviceName = device.model;
// deviceId = device.uuid;
//}
//else
{
var seed = [];
var keyName = 'randomId';
if (Dashboard.isRunningInCordova()) {
seed.push('cordova');
keyName = 'cordovaDeviceId';
}
deviceId = MediaBrowser.generateDeviceId(keyName, seed.join(','));
if (Dashboard.isRunningInCordova()) {
seed.push('cordova');
keyName = 'cordovaDeviceId';
}
deviceId = deviceId || MediaBrowser.generateDeviceId(keyName, seed.join(','));
return {
appName: appName,
appVersion: appVersion,
@ -1468,8 +1445,8 @@ var Dashboard = {
};
},
loadSwipebox: function() {
loadSwipebox: function () {
var deferred = DeferredBuilder.Deferred();
require([

4
dashboard-ui/scripts/tvrecommended.js
View file

@ -69,6 +69,8 @@
var parentId = LibraryMenu.getTopParentId();
var screenWidth = $(window).width();
var limit = AppInfo.hasLowImageBandwidth ?
4 :
6;
@ -102,7 +104,7 @@
shape: "backdrop",
showTitle: true,
showParentTitle: true,
overlayText: true,
overlayText: screenWidth >= 800 && !AppInfo.hasLowImageBandwidth,
lazy: true,
context: 'tv'