Merge remote-tracking branch 'upstream/master' into metadata-editor

This commit is contained in:
MrTimscampi
2020-05-16 18:59:09 +02:00
95 changed files with 1239 additions and 975 deletions
@@ -750,11 +750,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
return a.Name;
}).join(';');
if (item.Type === 'Series') {
context.querySelector('#selectDisplayOrder').value = item.DisplayOrder || '';
} else {
context.querySelector('#selectDisplayOrder').value = item.DisplayOrder || '';
}
context.querySelector('#selectDisplayOrder').value = item.DisplayOrder || '';
context.querySelector('#txtArtist').value = (item.ArtistItems || []).map(function (a) {
return a.Name;