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

pass requested fields to data layer

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-08 01:57:38 -04:00
parent e97f59a691
commit 81788655e9
5 changed files with 8 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/peoplecardbuilder.js vendored
View file

@ -68,15 +68,15 @@ define(['imageLoader', 'itemShortcuts', 'connectionManager', 'layoutManager'], f
} }
var nameHtml = ''; var nameHtml = '';
nameHtml += '<div class="cardText">' + person.Name + '</div>'; nameHtml += '<div class="cardText cardTextCentered">' + person.Name + '</div>';
if (person.Role) { if (person.Role) {
nameHtml += '<div class="cardText cardText-secondary">as ' + person.Role + '</div>'; nameHtml += '<div class="cardText cardText-secondary cardTextCentered">as ' + person.Role + '</div>';
} }
else if (person.Type) { else if (person.Type) {
nameHtml += '<div class="cardText cardText-secondary">' + Globalize.translate('core#' + person.Type) + '</div>'; nameHtml += '<div class="cardText cardText-secondary cardTextCentered">' + Globalize.translate('core#' + person.Type) + '</div>';
} else { } else {
nameHtml += '<div class="cardText cardText-secondary">&nbsp;</div>'; nameHtml += '<div class="cardText cardText-secondary cardTextCentered">&nbsp;</div>';
} }
var cardBoxCssClass = 'visualCardBox cardBox'; var cardBoxCssClass = 'visualCardBox cardBox';

8
dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.js vendored
View file

@ -156,7 +156,6 @@
AirDays: getSelectedAirDays(form), AirDays: getSelectedAirDays(form),
AirTime: form.querySelector('#txtAirTime').value, AirTime: form.querySelector('#txtAirTime').value,
Genres: editableListViewValues(form.querySelector("#listGenres")), Genres: editableListViewValues(form.querySelector("#listGenres")),
ProductionLocations: editableListViewValues(form.querySelector("#listCountries")),
Tags: editableListViewValues(form.querySelector("#listTags")), Tags: editableListViewValues(form.querySelector("#listTags")),
Keywords: editableListViewValues(form.querySelector("#listKeywords")), Keywords: editableListViewValues(form.querySelector("#listKeywords")),
Studios: editableListViewValues(form.querySelector("#listStudios")).map(function (element) { return { Name: element }; }), Studios: editableListViewValues(form.querySelector("#listStudios")).map(function (element) { return { Name: element }; }),
@ -683,12 +682,6 @@
showElement('#fldCustomRating', context); showElement('#fldCustomRating', context);
} }
if (item.Type == "Movie" || item.Type == "Trailer" || item.Type == "MusicArtist") {
showElement('#countriesCollapsible', context);
} else {
hideElement('#countriesCollapsible', context);
}
if (item.Type == "TvChannel") { if (item.Type == "TvChannel") {
hideElement('#tagsCollapsible', context); hideElement('#tagsCollapsible', context);
hideElement('#metadataSettingsCollapsible', context); hideElement('#metadataSettingsCollapsible', context);
@ -809,7 +802,6 @@
el.checked = (item.AirDays || []).indexOf(el.getAttribute('data-day')) != -1; el.checked = (item.AirDays || []).indexOf(el.getAttribute('data-day')) != -1;
}); });
populateListView(context.querySelector('#listCountries'), item.ProductionLocations || []);
populateListView(context.querySelector('#listGenres'), item.Genres); populateListView(context.querySelector('#listGenres'), item.Genres);
populatePeople(context, item.People || []); populatePeople(context, item.People || []);

10
dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.template.html vendored
View file

@ -224,16 +224,6 @@
</div> </div>
</div> </div>
<div id="countriesCollapsible" class="editableListviewContainer hide" style="margin-top: 3em;">
<h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
${Countries}
</h1>
<button is="emby-button" type="button" class="raised btnAddTextItem submit mini" style="margin-left:1em;" title="${Add}">
<i class="md-icon">add</i>
<span>${Add}</span>
</button>
<div class="paperList" id="listCountries"></div>
</div>
<div id="genresCollapsible" class="editableListviewContainer hide" style="margin-top: 3em;"> <div id="genresCollapsible" class="editableListviewContainer hide" style="margin-top: 3em;">
<h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;"> <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
${Genres} ${Genres}

12
dashboard-ui/components/apphost.js
View file

@ -148,16 +148,8 @@ define(['appStorage', 'browser'], function (appStorage, browser) {
features.push('fullscreen'); features.push('fullscreen');
} }
if (!browser.mobile) { if (!browser.slow) {
if (browser.safari) { features.push('imageanalysis');
if (browser.versionMajor && browser.versionMajor >= 10) {
features.push('imageanalysis');
}
} else {
features.push('imageanalysis');
}
} }
return features; return features;

4
dashboard-ui/scripts/itemdetailpage.js
View file

@ -239,9 +239,9 @@
} }
var itemBirthLocation = page.querySelector('#itemBirthLocation'); var itemBirthLocation = page.querySelector('#itemBirthLocation');
if (item.Type == "Person" && item.ProductionLocations && item.ProductionLocations.length) { if (item.Type == "Person" && item.PlaceOfBirth) {
var gmap = '<a class="textlink" target="_blank" href="https://maps.google.com/maps?q=' + item.ProductionLocations[0] + '">' + item.ProductionLocations[0] + '</a>'; var gmap = '<a class="textlink" target="_blank" href="https://maps.google.com/maps?q=' + item.PlaceOfBirth + '">' + item.PlaceOfBirth + '</a>';
itemBirthLocation.classList.remove('hide'); itemBirthLocation.classList.remove('hide');
itemBirthLocation.innerHTML = Globalize.translate('BirthPlaceValue').replace('{0}', gmap); itemBirthLocation.innerHTML = Globalize.translate('BirthPlaceValue').replace('{0}', gmap);