cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 11:28:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3376 from SenorSmartyPants/ImageDownloaderShowSeason

Browse Source 
Add option to season image downloader to pick from series images
This commit is contained in:
Bill Thornton 2022-02-17 00:23:03 -05:00 committed by GitHub
commit 016da1893f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/components/imageDownloader/imageDownloader.js
View File

@ -31,11 +31,16 @@ import template from './imageDownloader.template.html';
let browsableImageStartIndex = 0;
let browsableImageType = 'Primary';
let selectedProvider;
let browsableParentId;
function getBaseRemoteOptions() {
function getBaseRemoteOptions(page) {
const options = {};
options.itemId = currentItemId;
if (page.querySelector('#chkShowParentImages').checked && browsableParentId) {
options.itemId = browsableParentId;
} else {
options.itemId = currentItemId;
}
return options;
}
@ -43,7 +48,7 @@ import template from './imageDownloader.template.html';
function reloadBrowsableImages(page, apiClient) {
loading.show();
const options = getBaseRemoteOptions();
const options = getBaseRemoteOptions(page);
options.type = browsableImageType;
options.startIndex = browsableImageStartIndex;
@ -135,7 +140,7 @@ import template from './imageDownloader.template.html';
}
function downloadRemoteImage(page, apiClient, url, type, provider) {
const options = getBaseRemoteOptions();
const options = getBaseRemoteOptions(page);
options.Type = type;
options.ImageUrl = url;
@ -273,26 +278,31 @@ import template from './imageDownloader.template.html';
return html;
}
function reloadBrowsableImagesFirstPage(page, apiClient) {
browsableImageStartIndex = 0;
reloadBrowsableImages(page, apiClient);
}
function initEditor(page, apiClient) {
page.querySelector('#selectBrowsableImageType').addEventListener('change', function () {
browsableImageType = this.value;
browsableImageStartIndex = 0;
selectedProvider = null;
reloadBrowsableImages(page, apiClient);
reloadBrowsableImagesFirstPage(page, apiClient);
});
page.querySelector('#selectImageProvider').addEventListener('change', function () {
browsableImageStartIndex = 0;
selectedProvider = this.value;
reloadBrowsableImages(page, apiClient);
reloadBrowsableImagesFirstPage(page, apiClient);
});
page.querySelector('#chkAllLanguages').addEventListener('change', function () {
browsableImageStartIndex = 0;
reloadBrowsableImagesFirstPage(page, apiClient);
});
reloadBrowsableImages(page, apiClient);
page.querySelector('#chkShowParentImages').addEventListener('change', function () {
reloadBrowsableImagesFirstPage(page, apiClient);
});
page.addEventListener('click', function (e) {
@ -336,6 +346,10 @@ import template from './imageDownloader.template.html';
scrollHelper.centerFocus.on(dlg, false);
}
if (browsableParentId) {
dlg.querySelector('#lblShowParentImages').classList.remove('hide');
}
// Has to be assigned a z-index after the call to .open()
dlg.addEventListener('close', onDialogClosed);
@ -366,7 +380,7 @@ import template from './imageDownloader.template.html';
}
}
export function show(itemId, serverId, itemType, imageType) {
export function show(itemId, serverId, itemType, imageType, parentId) {
return new Promise(function (resolve, reject) {
currentResolve = resolve;
currentReject = reject;
@ -374,6 +388,7 @@ export function show(itemId, serverId, itemType, imageType) {
browsableImageStartIndex = 0;
browsableImageType = imageType || 'Primary';
selectedProvider = null;
browsableParentId = parentId;
showEditor(itemId, serverId, itemType);
});
}

4
src/components/imageDownloader/imageDownloader.template.html
View File

@ -39,6 +39,10 @@
<input id="chkAllLanguages" type="checkbox" is="emby-checkbox" />
<span>${AllLanguages}</span>
</label>
<label id="lblShowParentImages" class="hide" style="margin: 0 0 0 1em;width:auto;">
<input id="chkShowParentImages" type="checkbox" is="emby-checkbox" />
<span>${ShowParentImages}</span>
</label>
</div>
<div class="availableImagesList vertical-wrap centered"></div>

8
src/components/imageeditor/imageeditor.js
View File

@ -280,7 +280,13 @@ import template from './imageeditor.template.html';
function showImageDownloader(page, imageType) {
import('../imageDownloader/imageDownloader').then((ImageDownloader) => {
ImageDownloader.show(currentItem.Id, currentItem.ServerId, currentItem.Type, imageType).then(function () {
ImageDownloader.show(
currentItem.Id,
currentItem.ServerId,
currentItem.Type,
imageType,
currentItem.Type == 'Season' ? currentItem.ParentId : null
).then(function () {
hasChanges = true;
reload(page);
});

1
src/strings/en-us.json
View File

@ -1391,6 +1391,7 @@
"ShowIndicatorsFor": "Show indicators for:",
"ShowLess": "Show less",
"ShowMore": "Show more",
"ShowParentImages": "Show series images",
"Shows": "Shows",
"ShowTitle": "Show the title",
"ShowYear": "Show the year",