From 12fdec53b4e516372b7f40c71c321d355b12b036 Mon Sep 17 00:00:00 2001 From: ViXXoR Date: Sun, 13 Jan 2019 06:38:22 -0500 Subject: [PATCH] Cleaning up imageuploader Adding better error handling with description toast message and removing issues causing the user to have to reload the page Adds change with relation to jellyfin/jellyfin#247 --- .../imageuploader/imageuploader.js | 13 ++++++++++++- .../imageuploader/imageuploader.template.html | 3 ++- .../emby-webcomponents/strings/ar.json | 2 ++ .../emby-webcomponents/strings/be-by.json | 2 ++ .../emby-webcomponents/strings/bg-bg.json | 2 ++ .../emby-webcomponents/strings/ca.json | 2 ++ .../emby-webcomponents/strings/cs.json | 2 ++ .../emby-webcomponents/strings/da.json | 2 ++ .../emby-webcomponents/strings/de.json | 2 ++ .../emby-webcomponents/strings/el.json | 2 ++ .../emby-webcomponents/strings/en-gb.json | 2 ++ .../emby-webcomponents/strings/en-us.json | 2 ++ .../emby-webcomponents/strings/es-ar.json | 2 ++ .../emby-webcomponents/strings/es-mx.json | 2 ++ .../emby-webcomponents/strings/es.json | 2 ++ .../emby-webcomponents/strings/fi.json | 2 ++ .../emby-webcomponents/strings/fr-ca.json | 2 ++ .../emby-webcomponents/strings/fr.json | 2 ++ .../emby-webcomponents/strings/gsw.json | 2 ++ .../emby-webcomponents/strings/he.json | 2 ++ .../emby-webcomponents/strings/hr.json | 2 ++ .../emby-webcomponents/strings/hu.json | 2 ++ .../emby-webcomponents/strings/id.json | 2 ++ .../emby-webcomponents/strings/it.json | 2 ++ .../emby-webcomponents/strings/kk.json | 2 ++ .../emby-webcomponents/strings/ko.json | 2 ++ .../emby-webcomponents/strings/lt-lt.json | 2 ++ .../emby-webcomponents/strings/ms.json | 2 ++ .../emby-webcomponents/strings/nb.json | 2 ++ .../emby-webcomponents/strings/nl.json | 2 ++ .../emby-webcomponents/strings/pl.json | 2 ++ .../emby-webcomponents/strings/pt-br.json | 2 ++ .../emby-webcomponents/strings/pt-pt.json | 2 ++ .../emby-webcomponents/strings/ro.json | 2 ++ .../emby-webcomponents/strings/ru.json | 2 ++ .../emby-webcomponents/strings/sk.json | 2 ++ .../emby-webcomponents/strings/sl-si.json | 2 ++ .../emby-webcomponents/strings/sv.json | 2 ++ .../emby-webcomponents/strings/tr.json | 2 ++ .../emby-webcomponents/strings/uk.json | 2 ++ .../emby-webcomponents/strings/vi.json | 2 ++ .../emby-webcomponents/strings/zh-cn.json | 2 ++ .../emby-webcomponents/strings/zh-hk.json | 2 ++ .../emby-webcomponents/strings/zh-tw.json | 2 ++ 44 files changed, 98 insertions(+), 2 deletions(-) diff --git a/src/bower_components/emby-webcomponents/imageuploader/imageuploader.js b/src/bower_components/emby-webcomponents/imageuploader/imageuploader.js index 5d6c0f8745..eb68505118 100644 --- a/src/bower_components/emby-webcomponents/imageuploader/imageuploader.js +++ b/src/bower_components/emby-webcomponents/imageuploader/imageuploader.js @@ -74,7 +74,11 @@ return false; } - if (file.type !== "image/png" && file.type !== "image/jpeg" && file.type !== "image/jpeg") { + if (file.type !== "image/png" && file.type !== "image/x-png" && file.type !== "image/jpeg") { + require(['toast'], function (toast) { + toast(globalize.translate('sharedcomponents#MessageImageFileTypeAllowed')); + }); + e.preventDefault(); return false; } @@ -83,6 +87,13 @@ var dlg = dom.parentWithClass(this, 'dialog'); var imageType = dlg.querySelector('#selectImageType').value; + if (imageType === "None") { + require(["toast"], function(toast) { + toast(globalize.translate("sharedcomponents#MessageImageTypeNotSelected")); + }); + e.preventDefault(); + return false; + } connectionManager.getApiClient(currentServerId).uploadItemImage(currentItemId, imageType, file).then(function () { diff --git a/src/bower_components/emby-webcomponents/imageuploader/imageuploader.template.html b/src/bower_components/emby-webcomponents/imageuploader/imageuploader.template.html index f47bfd4320..19edc80cc2 100644 --- a/src/bower_components/emby-webcomponents/imageuploader/imageuploader.template.html +++ b/src/bower_components/emby-webcomponents/imageuploader/imageuploader.template.html @@ -22,12 +22,13 @@
${LabelDropImageHere}
- +