imageViewer updated.

Pony-House · Jul 29, 2024 · b2b5a1e · b2b5a1e
1 parent a01ef7e
commit b2b5a1e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/src/app/molecules/media/Media.jsx b/src/app/molecules/media/Media.jsx
@@ -194,7 +194,7 @@ function Image({
             imageLoaded = true;
             const img = $(event.target);
             const imgAction = () => {
-              imageViewer({ lightbox, imgQuery: img, name, url });
+              imageViewer({ lightbox, imgQuery: img, name });
             };
 
             img.off('click', imgAction);

diff --git a/src/app/organisms/profile-viewer/ProfileViewer.jsx b/src/app/organisms/profile-viewer/ProfileViewer.jsx
@@ -461,9 +461,7 @@ function ProfileViewer() {
             onClose: reopenProfile,
             imgQuery: img,
             name: username,
-            url: img.attr('src'),
             originalUrl: newAvatar,
-            readMime: true,
           });
         }
       };
@@ -682,9 +680,7 @@ function ProfileViewer() {
             lightbox,
             imgQuery: img,
             name: userId,
-            url: img.attr('src'),
             originalUrl: newAvatar,
-            readMime: true,
           });
         }
       };

diff --git a/src/app/organisms/profile-viewer/RoomViewer.jsx b/src/app/organisms/profile-viewer/RoomViewer.jsx
@@ -247,9 +247,7 @@ function RoomViewer() {
             lightbox,
             imgQuery: img,
             name: username,
-            url: img.attr('src'),
             originalUrl: newAvatar,
-            readMime: true,
           });
         }
       };

diff --git a/src/util/imageViewer.js b/src/util/imageViewer.js
@@ -14,6 +14,9 @@ export default function imageViewer(data) {
       // Read Image Tag
       const img = data.imgQuery.get(0);
       if (img) {
+        // File Url
+        const url = data.imgQuery.attr('src');
+
         // Get Mime
         let filename = data.name;
 
@@ -41,7 +44,7 @@ export default function imageViewer(data) {
         const options = {
           dataSource: [
             {
-              src: data.url,
+              src: url,
               alt: filename,
               width: imgData.width,
               height: imgData.height,
@@ -67,7 +70,7 @@ export default function imageViewer(data) {
               isButton: true,
               html: '<i class="fa-solid fa-arrow-up-right-from-square pswp__icn" height="32" width="32"></i>',
               onClick: () => {
-                window.open(data.url, '_blank').focus();
+                window.open(url, '_blank').focus();
               },
             });
           }
@@ -79,7 +82,7 @@ export default function imageViewer(data) {
             isButton: true,
             html: '<i class="fa-solid fa-floppy-disk pswp__icn" height="32" width="32"></i>',
             onClick: () => {
-              FileSaver.saveAs(data.url, filename);
+              FileSaver.saveAs(url, filename);
             },
           });
 
@@ -90,7 +93,7 @@ export default function imageViewer(data) {
             isButton: true,
             html: '<i class="fa-solid fa-circle-info pswp__icn" height="32" width="32"></i>',
             onClick: () => {
-              fetchFn(data.url)
+              fetchFn(url)
                 .then((res) => res.arrayBuffer())
                 .then(async (body) => {
                   const newTags = await ExifReader.load(body, {

diff --git a/src/util/libs/image.js b/src/util/libs/image.js
@@ -8,8 +8,6 @@ export function openOnGallery(imgUrl, fileName /* urlRevoke = false */) {
       lightbox: null,
       imgQuery: $(img),
       name: fileName,
-      url: imgUrl,
-      readMime: false,
     }).then((/* pswp */) => {
       /* pswp.on('close', () => {
                 pswp.destroy();