1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

merge from dev

This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions

View file

@ -3,7 +3,7 @@
function loadUpcoming(page) {
Dashboard.showLoadingMsg();
var limit = AppInfo.hasLowImageBandwidth ?
var limit = AppInfo.hasLowImageBandwidth && !enableScrollX() ?
24 :
40;
@ -16,7 +16,7 @@
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
};
ApiClient.getJSON(ApiClient.getUrl("Shows/Upcoming", query)).done(function (result) {
ApiClient.getJSON(ApiClient.getUrl("Shows/Upcoming", query)).then(function (result) {
var items = result.Items;
@ -36,7 +36,7 @@
}
function enableScrollX() {
return $.browser.mobile && AppInfo.enableAppLayouts;
return browserInfo.mobile && AppInfo.enableAppLayouts;
}
function getThumbShape() {