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

10
dashboard-ui/scripts/secondaryitems.js
View file

@ -90,7 +90,7 @@
var query = getQuery(parentItem);
ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(function (result) {
ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
// Scroll back up so they can see the results from the beginning
window.scrollTo(0, 0);
@ -161,18 +161,20 @@
});
}
$(document).on('pageinit', "#secondaryItemsPage", function () {
pageIdOn('pageinit', "secondaryItemsPage", function () {
var page = this;
$(page).on('click', '.mediaItem', onListItemClick);
}).on('pagebeforeshow', "#secondaryItemsPage", function () {
});
pageIdOn('pagebeforeshow', "secondaryItemsPage", function () {
var page = this;
if (getParameterByName('parentid')) {
ApiClient.getItem(Dashboard.getCurrentUserId(), getParameterByName('parentid')).done(function (parent) {
ApiClient.getItem(Dashboard.getCurrentUserId(), getParameterByName('parentid')).then(function (parent) {
LibraryMenu.setTitle(parent.Name);
if (LibraryBrowser.needsRefresh(page)) {