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

add option to merge metadata and IBN paths

This commit is contained in:
Luke Pulverenti 2015-01-26 11:47:15 -05:00
parent 3969693dad
commit 2bcfc0f0ba
13 changed files with 31 additions and 23 deletions

View file

@ -62,7 +62,7 @@
html += '</div>';
}
elem = $(elem).html(html).lazyChildren();
elem = $(elem).html(html).trigger('create').lazyChildren();
elem.createCardMenus();
});
}

View file

@ -433,7 +433,6 @@
playFromHere: true,
defaultAction: 'playallfromhere'
});
}
else if (query.IncludeItemTypes == "Movie" || query.IncludeItemTypes == "Trailer") {
@ -489,7 +488,7 @@
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
$('#items', page).html(html).lazyChildren();
$('#items', page).html(html).trigger('create').lazyChildren();
$('.btnNextPage', page).on('click', function () {

View file

@ -2,6 +2,12 @@
function loadPage(page, config) {
if (config.MergeMetadataAndImagesByName) {
$('.fldImagesByName', page).hide();
} else {
$('.fldImagesByName', page).show();
}
$('#txtSeasonZeroName', page).val(config.SeasonZeroDisplayName);
$('#chkEnableRealtimeMonitor', page).checked(config.EnableRealtimeMonitor).checkboxradio("refresh");

View file

@ -15,7 +15,7 @@
if (showManualForm) {
LoginPage.showManualForm(page, false);
LoginPage.showManualForm(page, false, false);
} else {
LoginPage.showVisualForm(page);
@ -36,10 +36,15 @@
LoginPage.showVisualForm($.mobile.activePage);
},
showManualForm: function (page, showCancel) {
showManualForm: function (page, showCancel, focusPassword) {
$('.visualLoginForm', page).hide();
$('#manualLoginForm', page).show();
$('#txtManualName', page).focus();
if (focusPassword) {
$('#txtManualPassword', page).focus();
} else {
$('#txtManualName', page).focus();
}
if (showCancel) {
$('.btnCancel', page).show();
@ -175,7 +180,7 @@
} else {
$('#txtManualName', page).val(name);
$('#txtManualPassword', '#loginPage').val('');
LoginPage.showManualForm(page, true);
LoginPage.showManualForm(page, true, true);
}
});
},

View file

@ -19,7 +19,7 @@
Dashboard.hideLoadingMsg();
}
$(document).on('pageshow', "#metadataKodiPage", function () {
$(document).on('pageshow', "#metadataNfoPage", function () {
Dashboard.showLoadingMsg();
@ -34,7 +34,7 @@
});
});
window.KodiMetadataPage = {
window.NfoMetadataPage = {
onSubmit: function () {

View file

@ -2,7 +2,6 @@
$(document).on('pagebeforeshow', "#musicRecommendedPage", function () {
var screenWidth = $(window).width();
var userId = Dashboard.getCurrentUserId();
var page = this;