From aec6d4b3d33a2a9aa6716341a5d5e46a03047273 Mon Sep 17 00:00:00 2001 From: Reaby Date: Wed, 16 Nov 2022 21:06:54 +0200 Subject: [PATCH] Fixes .jpeg images to show after upload --- routes/admin.js | 2 +- views/admin/editSlide.twig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/routes/admin.js b/routes/admin.js index 368f4c2..8f2cf2e 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -260,7 +260,7 @@ export default function (pluginManager, websocket, dispatcher) { let output = []; for (let file of bundleImages) { - if (file.match(/(.*\.png)|(.*\.jpg)/i)) { + if (file.match(/(.*\.png)|(.*\.jpg)|(.*\.jpeg)/i)) { output.push({ url: "/images/" + bundle + "/" + file, name: file diff --git a/views/admin/editSlide.twig b/views/admin/editSlide.twig index 58e9088..53b8d7b 100644 --- a/views/admin/editSlide.twig +++ b/views/admin/editSlide.twig @@ -313,9 +313,9 @@ on: { load: function (e, file) { // check file type - var imageType = /image.(jpeg|png)/; + var imageType = /image.(jpeg|jpg|png)/; if (!file.type.match(imageType)) { - // alert("File \"" + file.name + "\" is not a valid image file, only jpeg and png are supported"); + alert("File \"" + file.name + "\" is not a valid image file, only jpeg and png are supported"); return false; }