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

denormalize seasonid

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-05 01:40:18 -04:00
parent 1fd0fd981a
commit 5ba13ab5a0
14 changed files with 91 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@
IsMissing: false,
IsVirtualUnaired: false,
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
EnableImageTypes: "Primary,Backdrop,Thumb",
StartIndex: 0,
Limit: pageSize
},

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

@ -8,7 +8,7 @@
Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo",
UserId: Dashboard.getCurrentUserId(),
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
EnableImageTypes: "Primary,Backdrop,Thumb"
};
return ApiClient.getNextUpEpisodes(query);

3
dashboard-ui/scripts/homeupcoming.js
View file

@ -7,7 +7,7 @@
var query = {
Limit: 40,
Fields: "AirTime,UserData,SeriesStudio,SyncInfo",
Fields: "AirTime,UserData,SyncInfo",
UserId: Dashboard.getCurrentUserId(),
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
@ -110,7 +110,6 @@
showLocationTypeIndicator: false,
shape: getThumbShape(),
showTitle: true,
showPremiereDate: true,
preferThumb: true,
lazy: true,
showDetailsMenu: true,

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

@ -1330,7 +1330,7 @@
});
}
else if (item.AlbumId && item.SeriesPrimaryImageTag) {
else if (item.SeriesId && item.SeriesPrimaryImageTag) {
imgUrl = ApiClient.getScaledImageUrl(item.SeriesId, {
type: "Primary",
@ -1993,18 +1993,9 @@
enableImageEnhancers: enableImageEnhancers
});
} else if (options.preferThumb && imageItem.SeriesThumbImageTag && options.inheritThumb !== false) {
imgUrl = ApiClient.getScaledImageUrl(imageItem.SeriesId, {
type: "Thumb",
maxWidth: thumbWidth,
tag: imageItem.SeriesThumbImageTag,
enableImageEnhancers: enableImageEnhancers
});
} else if (options.preferThumb && imageItem.ParentThumbItemId && options.inheritThumb !== false) {
imgUrl = ApiClient.getThumbImageUrl(imageItem.ParentThumbItemId, {
imgUrl = ApiClient.getScaledImageUrl(imageItem.ParentThumbItemId, {
type: "Thumb",
maxWidth: thumbWidth,
enableImageEnhancers: enableImageEnhancers
@ -2100,15 +2091,6 @@
enableImageEnhancers: enableImageEnhancers
});
} else if (imageItem.SeriesThumbImageTag) {
imgUrl = ApiClient.getScaledImageUrl(imageItem.SeriesId, {
type: "Thumb",
maxWidth: thumbWidth,
tag: imageItem.SeriesThumbImageTag,
enableImageEnhancers: enableImageEnhancers
});
} else if (imageItem.ParentThumbItemId) {
imgUrl = ApiClient.getThumbImageUrl(imageItem, {
@ -2539,6 +2521,8 @@
getPremiereDateText: function (item, date) {
var studio = (item.Studios || [])[0];
if (!date) {
var text = '';
@ -2547,12 +2531,12 @@
text += item.AirTime;
}
if (item.SeriesStudio) {
if (studio) {
if (text) {
text += " on " + item.SeriesStudio;
text += " on " + studio;
} else {
text += item.SeriesStudio;
text += studio;
}
}
@ -2565,8 +2549,8 @@
day += " at " + item.AirTime;
}
if (item.SeriesStudio) {
day += " on " + item.SeriesStudio;
if (studio) {
day += " on " + studio;
}
return day;

5
dashboard-ui/scripts/searchpage.js
View file

@ -187,10 +187,15 @@
});
view.addEventListener('viewbeforeshow', function (e) {
document.body.classList.add('hiddenViewMenuBar');
document.body.classList.add('hiddenNowPlayingBar');
LibraryMenu.setMenuButtonVisible(false);
});
view.addEventListener('viewbeforehide', function (e) {
document.body.classList.remove('hiddenViewMenuBar');
document.body.classList.remove('hiddenNowPlayingBar');
LibraryMenu.setMenuButtonVisible(true);
});

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

@ -21,7 +21,7 @@
Limit: 100,
StartIndex: 0,
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
EnableImageTypes: "Primary"
}
};

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

@ -20,7 +20,7 @@
Fields: "PrimaryImageAspectRatio,SyncInfo",
ParentId: parentId,
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
EnableImageTypes: "Primary,Backdrop,Thumb"
};
return ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options));

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

@ -30,7 +30,7 @@
Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo",
UserId: Dashboard.getCurrentUserId(),
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
EnableImageTypes: "Primary,Backdrop,Thumb"
};
query.ParentId = LibraryMenu.getTopParentId();
@ -108,7 +108,7 @@
ExcludeLocationTypes: "Virtual",
ParentId: parentId,
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
EnableImageTypes: "Primary,Backdrop,Thumb",
EnableTotalRecordCount: false
};

3
dashboard-ui/scripts/tvupcoming.js
View file

@ -7,7 +7,7 @@
var query = {
Limit: 40,
Fields: "AirTime,UserData,SeriesStudio,SyncInfo",
Fields: "AirTime,UserData,SyncInfo",
UserId: Dashboard.getCurrentUserId(),
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
@ -112,7 +112,6 @@
showLocationTypeIndicator: false,
shape: getThumbShape(),
showTitle: true,
showPremiereDate: true,
preferThumb: true,
lazy: true,
showDetailsMenu: true,