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

@ -22,7 +22,7 @@
Dashboard.showLoadingMsg();
ApiClient.getLiveTvPrograms(query).done(function (result) {
ApiClient.getLiveTvPrograms(query).then(function (result) {
// Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0);
@ -85,7 +85,7 @@
});
}
$(document).on('pagebeforeshow', "#liveTvItemsPage", function () {
pageIdOn('pagebeforeshow', "liveTvItemsPage", function () {
query.ParentId = LibraryMenu.getTopParentId();