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

merge from dev

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/scripts/playlists.js
View file

@ -52,10 +52,10 @@
var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query);
var promise2 = Dashboard.getCurrentUser();
$.when(promise1, promise2).done(function (response1, response2) {
Promise.all([promise1, promise2]).then(function (responses) {
var result = response1[0];
var user = response2[0];
var result = responses[0];
var user = responses[1];
// Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0);
@ -162,7 +162,7 @@
});
}
$(document).on('pagebeforeshow', "#playlistsPage", function () {
pageIdOn('pagebeforeshow', "playlistsPage", function () {
var page = this;
reloadItems(page);