From fb8a90ac501545070dc60d5b9c0a9274ac459a07 Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 27 Jul 2020 11:05:20 +0100 Subject: [PATCH 1/5] Migration of imageEditor and imageDownloader to ES6 modules --- package.json | 2 + .../imageDownloader/imageDownloader.js | 130 +++++++++------- src/components/imageeditor/imageeditor.js | 146 ++++++++++-------- 3 files changed, 157 insertions(+), 121 deletions(-) diff --git a/package.json b/package.json index da8c87aed..07f86c2eb 100644 --- a/package.json +++ b/package.json @@ -114,6 +114,8 @@ "src/components/htmlMediaHelper.js", "src/components/imageOptionsEditor/imageOptionsEditor.js", "src/components/images/imageLoader.js", + "src/components/imageDownloader/imageDownloader.js", + "src/components/imageeditor/imageeditor.js", "src/components/imageUploader/imageUploader.js", "src/components/indicators/indicators.js", "src/components/itemContextMenu.js", diff --git a/src/components/imageDownloader/imageDownloader.js b/src/components/imageDownloader/imageDownloader.js index 6d5b370bb..510fc3129 100644 --- a/src/components/imageDownloader/imageDownloader.js +++ b/src/components/imageDownloader/imageDownloader.js @@ -1,24 +1,40 @@ -define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader', 'browser', 'layoutManager', 'scrollHelper', 'globalize', 'require', 'emby-checkbox', 'paper-icon-button-light', 'emby-button', 'formDialogStyle', 'cardStyle'], function (dom, loading, appHost, dialogHelper, connectionManager, imageLoader, browser, layoutManager, scrollHelper, globalize, require) { - 'use strict'; +import dom from 'dom'; +import loading from 'loading'; +import appHost from 'apphost'; +import dialogHelper from 'dialogHelper'; +import connectionManager from 'connectionManager'; +import imageLoader from 'imageLoader'; +import browser from 'browser'; +import layoutManager from 'layoutManager'; +import scrollHelper from 'scrollHelper'; +import globalize from 'globalize'; +import require from 'require'; +import 'emby-checkbox'; +import 'paper-icon-button-light'; +import 'emby-button'; +import 'formDialogStyle'; +import 'cardStyle'; - var enableFocusTransform = !browser.slow && !browser.edge; +/* eslint-disable indent */ - var currentItemId; - var currentItemType; - var currentResolve; - var currentReject; - var hasChanges = false; + const enableFocusTransform = !browser.slow && !browser.edge; + + let currentItemId; + let currentItemType; + let currentResolve; + let currentReject; + let hasChanges = false; // These images can be large and we're seeing memory problems in safari - var browsableImagePageSize = browser.slow ? 6 : 30; + const browsableImagePageSize = browser.slow ? 6 : 30; - var browsableImageStartIndex = 0; - var browsableImageType = 'Primary'; - var selectedProvider; + let browsableImageStartIndex = 0; + let browsableImageType = 'Primary'; + let selectedProvider; function getBaseRemoteOptions() { - var options = {}; + const options = {}; options.itemId = currentItemId; @@ -29,14 +45,14 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image loading.show(); - var options = getBaseRemoteOptions(); + const options = getBaseRemoteOptions(); options.type = browsableImageType; options.startIndex = browsableImageStartIndex; options.limit = browsableImagePageSize; options.IncludeAllLanguages = page.querySelector('#chkAllLanguages').checked; - var provider = selectedProvider || ''; + const provider = selectedProvider || ''; if (provider) { options.ProviderName = provider; @@ -48,11 +64,11 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image page.querySelector('#selectBrowsableImageType').value = browsableImageType; - var providersHtml = result.Providers.map(function (p) { + const providersHtml = result.Providers.map(function (p) { return ''; }); - var selectImageProvider = page.querySelector('#selectImageProvider'); + const selectImageProvider = page.querySelector('#selectImageProvider'); selectImageProvider.innerHTML = '' + providersHtml; selectImageProvider.value = provider; @@ -65,19 +81,19 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image page.querySelector('.availableImagesPaging').innerHTML = getPagingHtml(startIndex, limit, imagesResult.TotalRecordCount); - var html = ''; + let html = ''; - for (var i = 0, length = imagesResult.Images.length; i < length; i++) { + for (let i = 0, length = imagesResult.Images.length; i < length; i++) { html += getRemoteImageHtml(imagesResult.Images[i], imageType, apiClient); } - var availableImagesList = page.querySelector('.availableImagesList'); + const availableImagesList = page.querySelector('.availableImagesList'); availableImagesList.innerHTML = html; imageLoader.lazyChildren(availableImagesList); - var btnNextPage = page.querySelector('.btnNextPage'); - var btnPreviousPage = page.querySelector('.btnPreviousPage'); + const btnNextPage = page.querySelector('.btnNextPage'); + const btnPreviousPage = page.querySelector('.btnPreviousPage'); if (btnNextPage) { btnNextPage.addEventListener('click', function () { @@ -97,18 +113,18 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image function getPagingHtml(startIndex, limit, totalRecordCount) { - var html = ''; + let html = ''; - var recordsEnd = Math.min(startIndex + limit, totalRecordCount); + const recordsEnd = Math.min(startIndex + limit, totalRecordCount); // 20 is the minimum page size - var showControls = totalRecordCount > limit; + const showControls = totalRecordCount > limit; html += '
'; html += ''; - var startAtDisplay = totalRecordCount ? startIndex + 1 : 0; + const startAtDisplay = totalRecordCount ? startIndex + 1 : 0; html += globalize.translate('ListPaging', startAtDisplay, recordsEnd, totalRecordCount); html += ''; @@ -127,7 +143,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image } function downloadRemoteImage(page, apiClient, url, type, provider) { - var options = getBaseRemoteOptions(); + const options = getBaseRemoteOptions(); options.Type = type; options.ImageUrl = url; @@ -138,7 +154,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image apiClient.downloadRemoteImage(options).then(function () { hasChanges = true; - var dlg = dom.parentWithClass(page, 'dialog'); + const dlg = dom.parentWithClass(page, 'dialog'); dialogHelper.close(dlg); }); } @@ -148,17 +164,17 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image } function getRemoteImageHtml(image, imageType, apiClient) { - var tagName = layoutManager.tv ? 'button' : 'div'; - var enableFooterButtons = !layoutManager.tv; + const tagName = layoutManager.tv ? 'button' : 'div'; + const enableFooterButtons = !layoutManager.tv; // TODO move card creation code to Card component - var html = ''; + let html = ''; - var cssClass = 'card scalableCard imageEditorCard'; - var cardBoxCssClass = 'cardBox visualCardBox'; + let cssClass = 'card scalableCard imageEditorCard'; + const cardBoxCssClass = 'cardBox visualCardBox'; - var shape = 'backdrop'; + let shape = 'backdrop'; if (imageType === 'Backdrop' || imageType === 'Art' || imageType === 'Thumb' || imageType === 'Logo') { shape = 'backdrop'; } else if (imageType === 'Banner') { @@ -302,14 +318,14 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image page.addEventListener('click', function (e) { - var btnDownloadRemoteImage = dom.parentWithClass(e.target, 'btnDownloadRemoteImage'); + const btnDownloadRemoteImage = dom.parentWithClass(e.target, 'btnDownloadRemoteImage'); if (btnDownloadRemoteImage) { - var card = dom.parentWithClass(btnDownloadRemoteImage, 'card'); + const card = dom.parentWithClass(btnDownloadRemoteImage, 'card'); downloadRemoteImage(page, apiClient, card.getAttribute('data-imageurl'), card.getAttribute('data-imagetype'), card.getAttribute('data-imageprovider')); return; } - var btnImageCard = dom.parentWithClass(e.target, 'btnImageCard'); + const btnImageCard = dom.parentWithClass(e.target, 'btnImageCard'); if (btnImageCard) { downloadRemoteImage(page, apiClient, btnImageCard.getAttribute('data-imageurl'), btnImageCard.getAttribute('data-imagetype'), btnImageCard.getAttribute('data-imageprovider')); } @@ -321,12 +337,12 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image require(['text!./imageDownloader.template.html'], function (template) { - var apiClient = connectionManager.getApiClient(serverId); + const apiClient = connectionManager.getApiClient(serverId); currentItemId = itemId; currentItemType = itemType; - var dialogOptions = { + const dialogOptions = { removeOnClose: true }; @@ -336,7 +352,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image dialogOptions.size = 'small'; } - var dlg = dialogHelper.createDialog(dialogOptions); + const dlg = dialogHelper.createDialog(dialogOptions); dlg.innerHTML = globalize.translateHtml(template, 'core'); @@ -349,7 +365,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image dialogHelper.open(dlg); - var editorContent = dlg.querySelector('.formDialogContent'); + const editorContent = dlg.querySelector('.formDialogContent'); initEditor(editorContent, apiClient); dlg.querySelector('.btnCancel').addEventListener('click', function () { @@ -362,7 +378,7 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image } function onDialogClosed() { - var dlg = this; + const dlg = this; if (layoutManager.tv) { scrollHelper.centerFocus.off(dlg, false); @@ -376,18 +392,20 @@ define(['dom', 'loading', 'apphost', 'dialogHelper', 'connectionManager', 'image } } - return { - show: function (itemId, serverId, itemType, imageType) { - return new Promise(function (resolve, reject) { - currentResolve = resolve; - currentReject = reject; - hasChanges = false; - browsableImageStartIndex = 0; - browsableImageType = imageType || 'Primary'; - selectedProvider = null; +export function show (itemId, serverId, itemType, imageType) { + return new Promise(function (resolve, reject) { + currentResolve = resolve; + currentReject = reject; + hasChanges = false; + browsableImageStartIndex = 0; + browsableImageType = imageType || 'Primary'; + selectedProvider = null; + showEditor(itemId, serverId, itemType); + }); +} - showEditor(itemId, serverId, itemType); - }); - } - }; -}); +export default { + show: show +}; + +/* eslint-enable indent */ diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js index 0a873fa4c..f0c6b4576 100644 --- a/src/components/imageeditor/imageeditor.js +++ b/src/components/imageeditor/imageeditor.js @@ -1,14 +1,30 @@ -define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', 'focusManager', 'globalize', 'scrollHelper', 'imageLoader', 'require', 'browser', 'apphost', 'cardStyle', 'formDialogStyle', 'emby-button', 'paper-icon-button-light', 'css!./imageeditor'], function (dialogHelper, connectionManager, loading, dom, layoutManager, focusManager, globalize, scrollHelper, imageLoader, require, browser, appHost) { - 'use strict'; +import dialogHelper from 'dialogHelper'; +import connectionManager from 'connectionManager'; +import loading from 'loading'; +import dom from 'dom'; +import layoutManager from 'layoutManager'; +import focusManager from 'focusManager'; +import globalize from 'globalize'; +import scrollHelper from 'scrollHelper'; +import imageLoader from 'imageLoader'; +import browser from 'browser'; +import appHost from 'apphost'; +import 'cardStyle'; +import 'formDialogStyle'; +import 'emby-button'; +import 'paper-icon-button-light'; +import 'css!./imageeditor'; - var enableFocusTransform = !browser.slow && !browser.edge; +/* eslint-disable indent */ - var currentItem; - var hasChanges = false; + const enableFocusTransform = !browser.slow && !browser.edge; + + let currentItem; + let hasChanges = false; function getBaseRemoteOptions() { - var options = {}; + const options = {}; options.itemId = currentItem.Id; @@ -19,7 +35,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', loading.show(); - var apiClient; + let apiClient; if (item) { apiClient = connectionManager.getApiClient(item.ServerId); @@ -36,7 +52,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', function addListeners(container, className, eventName, fn) { container.addEventListener(eventName, function (e) { - var elem = dom.parentWithClass(e.target, className); + const elem = dom.parentWithClass(e.target, className); if (elem) { fn.call(elem, e); } @@ -49,8 +65,8 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', apiClient.getRemoteImageProviders(getBaseRemoteOptions()).then(function (providers) { - var btnBrowseAllImages = page.querySelectorAll('.btnBrowseAllImages'); - for (var i = 0, length = btnBrowseAllImages.length; i < length; i++) { + const btnBrowseAllImages = page.querySelectorAll('.btnBrowseAllImages'); + for (let i = 0, length = btnBrowseAllImages.length; i < length; i++) { if (providers.length) { btnBrowseAllImages[i].classList.remove('hide'); @@ -97,10 +113,10 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', // TODO move card creation code to Card component - var html = ''; + let html = ''; - var cssClass = 'card scalableCard imageEditorCard'; - var cardBoxCssClass = 'cardBox visualCardBox'; + let cssClass = 'card scalableCard imageEditorCard'; + const cardBoxCssClass = 'cardBox visualCardBox'; cssClass += ' backdropCard backdropCard-scalable'; @@ -130,7 +146,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', html += '
'; - var imageUrl = getImageUrl(currentItem, apiClient, image.ImageType, image.ImageIndex, { maxWidth: imageSize }); + const imageUrl = getImageUrl(currentItem, apiClient, image.ImageType, image.ImageIndex, { maxWidth: imageSize }); html += '
'; @@ -184,7 +200,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', function deleteImage(context, itemId, type, index, apiClient, enableConfirmation) { - var afterConfirm = function () { + const afterConfirm = function () { apiClient.deleteItemImage(itemId, type, index).then(function () { hasChanges = true; @@ -198,7 +214,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', return; } - require(['confirm'], function (confirm) { + import('confirm').then(({default: confirm}) => { confirm.default({ @@ -218,7 +234,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', reload(context, null, focusContext); }, function () { - require(['alert'], function (alert) { + import('alert').then(({default: alert}) => { alert(globalize.translate('DefaultErrorMessage')); }); }); @@ -226,20 +242,20 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', function renderImages(page, item, apiClient, images, imageProviders, elem) { - var html = ''; + let html = ''; - var imageSize = 300; - var windowSize = dom.getWindowSize(); + let imageSize = 300; + const windowSize = dom.getWindowSize(); if (windowSize.innerWidth >= 1280) { imageSize = Math.round(windowSize.innerWidth / 4); } - var tagName = layoutManager.tv ? 'button' : 'div'; - var enableFooterButtons = !layoutManager.tv; + const tagName = layoutManager.tv ? 'button' : 'div'; + const enableFooterButtons = !layoutManager.tv; - for (var i = 0, length = images.length; i < length; i++) { + for (let i = 0, length = images.length; i < length; i++) { - var image = images[i]; + const image = images[i]; html += getCardHtml(image, i, length, apiClient, imageProviders, imageSize, tagName, enableFooterButtons); } @@ -250,7 +266,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', function renderStandardImages(page, apiClient, item, imageInfos, imageProviders) { - var images = imageInfos.filter(function (i) { + const images = imageInfos.filter(function (i) { return i.ImageType !== 'Screenshot' && i.ImageType !== 'Backdrop' && i.ImageType !== 'Chapter'; }); @@ -259,7 +275,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', function renderBackdrops(page, apiClient, item, imageInfos, imageProviders) { - var images = imageInfos.filter(function (i) { + const images = imageInfos.filter(function (i) { return i.ImageType === 'Backdrop'; }).sort(function (a, b) { @@ -276,7 +292,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', function renderScreenshots(page, apiClient, item, imageInfos, imageProviders) { - var images = imageInfos.filter(function (i) { + const images = imageInfos.filter(function (i) { return i.ImageType === 'Screenshot'; }).sort(function (a, b) { @@ -293,7 +309,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', function showImageDownloader(page, imageType) { - require(['imageDownloader'], function (ImageDownloader) { + import('imageDownloader').then(({default: ImageDownloader}) => { ImageDownloader.show(currentItem.Id, currentItem.ServerId, currentItem.Type, imageType).then(function () { @@ -306,18 +322,18 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', function showActionSheet(context, imageCard) { - var itemId = imageCard.getAttribute('data-id'); - var serverId = imageCard.getAttribute('data-serverid'); - var apiClient = connectionManager.getApiClient(serverId); + const itemId = imageCard.getAttribute('data-id'); + const serverId = imageCard.getAttribute('data-serverid'); + const apiClient = connectionManager.getApiClient(serverId); - var type = imageCard.getAttribute('data-imagetype'); - var index = parseInt(imageCard.getAttribute('data-index')); - var providerCount = parseInt(imageCard.getAttribute('data-providers')); - var numImages = parseInt(imageCard.getAttribute('data-numimages')); + const type = imageCard.getAttribute('data-imagetype'); + const index = parseInt(imageCard.getAttribute('data-index')); + const providerCount = parseInt(imageCard.getAttribute('data-providers')); + const numImages = parseInt(imageCard.getAttribute('data-numimages')); - require(['actionsheet'], function (actionSheet) { + import('actionsheet').then(({default: actionSheet}) => { - var commands = []; + const commands = []; commands.push({ name: globalize.translate('Delete'), @@ -378,9 +394,9 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', function initEditor(context, options) { - var uploadButtons = context.querySelectorAll('.btnOpenUploadMenu'); - var isFileInputSupported = appHost.supports('fileinput'); - for (var i = 0, length = uploadButtons.length; i < length; i++) { + const uploadButtons = context.querySelectorAll('.btnOpenUploadMenu'); + const isFileInputSupported = appHost.supports('fileinput'); + for (let i = 0, length = uploadButtons.length; i < length; i++) { if (isFileInputSupported) { uploadButtons[i].classList.remove('hide'); } else { @@ -389,9 +405,9 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', } addListeners(context, 'btnOpenUploadMenu', 'click', function () { - var imageType = this.getAttribute('data-imagetype'); + const imageType = this.getAttribute('data-imagetype'); - require(['imageUploader'], function (imageUploader) { + import('imageUploader').then(({default: imageUploader}) => { imageUploader.show({ @@ -423,34 +439,34 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', }); addListeners(context, 'btnDeleteImage', 'click', function () { - var type = this.getAttribute('data-imagetype'); - var index = this.getAttribute('data-index'); + const type = this.getAttribute('data-imagetype'); + let index = this.getAttribute('data-index'); index = index === 'null' ? null : parseInt(index); - var apiClient = connectionManager.getApiClient(currentItem.ServerId); + const apiClient = connectionManager.getApiClient(currentItem.ServerId); deleteImage(context, currentItem.Id, type, index, apiClient, true); }); addListeners(context, 'btnMoveImage', 'click', function () { - var type = this.getAttribute('data-imagetype'); - var index = this.getAttribute('data-index'); - var newIndex = this.getAttribute('data-newindex'); - var apiClient = connectionManager.getApiClient(currentItem.ServerId); + const type = this.getAttribute('data-imagetype'); + const index = this.getAttribute('data-index'); + const newIndex = this.getAttribute('data-newindex'); + const apiClient = connectionManager.getApiClient(currentItem.ServerId); moveImage(context, apiClient, currentItem.Id, type, index, newIndex, dom.parentWithClass(this, 'itemsContainer')); }); } function showEditor(options, resolve, reject) { - var itemId = options.itemId; - var serverId = options.serverId; + const itemId = options.itemId; + const serverId = options.serverId; loading.show(); - require(['text!./imageeditor.template.html'], function (template) { - var apiClient = connectionManager.getApiClient(serverId); + import('text!./imageeditor.template.html').then(({default: template}) => { + const apiClient = connectionManager.getApiClient(serverId); apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) { - var dialogOptions = { + const dialogOptions = { removeOnClose: true }; @@ -460,7 +476,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', dialogOptions.size = 'small'; } - var dlg = dialogHelper.createDialog(dialogOptions); + const dlg = dialogHelper.createDialog(dialogOptions); dlg.classList.add('formDialog'); @@ -500,15 +516,15 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', }); } - return { - show: function (options) { +export function show (options) { + return new Promise(function (resolve, reject) { + hasChanges = false; + showEditor(options, resolve, reject); + }); +} - return new Promise(function (resolve, reject) { +export default { + show +}; - hasChanges = false; - - showEditor(options, resolve, reject); - }); - } - }; -}); +/* eslint-enable indent */ From 04199ae9f6fe3542674ceb0a4ccda3b4066d4bd3 Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 27 Jul 2020 13:57:12 +0100 Subject: [PATCH 2/5] fix lint --- src/components/imageeditor/imageeditor.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js index 181ceaac8..e27316148 100644 --- a/src/components/imageeditor/imageeditor.js +++ b/src/components/imageeditor/imageeditor.js @@ -59,7 +59,6 @@ import 'css!./imageeditor'; currentItem = item; apiClient.getRemoteImageProviders(getBaseRemoteOptions()).then(function (providers) { - const btnBrowseAllImages = page.querySelectorAll('.btnBrowseAllImages'); for (let i = 0, length = btnBrowseAllImages.length; i < length; i++) { if (providers.length) { From 5bd4b849d628cb13ecc4570d6bd1ec2c459f8ce0 Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 28 Jul 2020 17:51:53 +0100 Subject: [PATCH 3/5] Update src/components/imageDownloader/imageDownloader.js Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com> --- src/components/imageDownloader/imageDownloader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/imageDownloader/imageDownloader.js b/src/components/imageDownloader/imageDownloader.js index 80bc30f8b..0d2cb9140 100644 --- a/src/components/imageDownloader/imageDownloader.js +++ b/src/components/imageDownloader/imageDownloader.js @@ -372,7 +372,7 @@ import 'cardStyle'; } } -export function show (itemId, serverId, itemType, imageType) { +export function show(itemId, serverId, itemType, imageType) { return new Promise(function (resolve, reject) { currentResolve = resolve; currentReject = reject; From 6cb8f030055fc7efc912316b00d598e168fe1f61 Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 28 Jul 2020 17:51:59 +0100 Subject: [PATCH 4/5] Update src/components/imageeditor/imageeditor.js Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com> --- src/components/imageeditor/imageeditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js index e27316148..78c35bb15 100644 --- a/src/components/imageeditor/imageeditor.js +++ b/src/components/imageeditor/imageeditor.js @@ -201,7 +201,7 @@ import 'css!./imageeditor'; } import('confirm').then(({default: confirm}) => { - confirm.default({ + confirm({ text: globalize.translate('ConfirmDeleteImage'), confirmText: globalize.translate('Delete'), From 4a3f05a58f8422c02ba8a48e4de6d31456c48b9c Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 28 Jul 2020 21:08:32 +0100 Subject: [PATCH 5/5] Update src/components/imageDownloader/imageDownloader.js Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com> --- src/components/imageDownloader/imageDownloader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/imageDownloader/imageDownloader.js b/src/components/imageDownloader/imageDownloader.js index 0d2cb9140..2be2ef09b 100644 --- a/src/components/imageDownloader/imageDownloader.js +++ b/src/components/imageDownloader/imageDownloader.js @@ -165,7 +165,7 @@ import 'cardStyle'; let cssClass = 'card scalableCard imageEditorCard'; const cardBoxCssClass = 'cardBox visualCardBox'; - let shape = 'backdrop'; + let shape; if (imageType === 'Backdrop' || imageType === 'Art' || imageType === 'Thumb' || imageType === 'Logo') { shape = 'backdrop'; } else if (imageType === 'Banner') {