fix: fix assets to link to the correct URL

eXaminator · Jul 25, 2022 · 3748855 · 3748855
1 parent d250b75
commit 3748855
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 23 deletions.
diff --git a/src/KankaJournal/KankaJournalApplication.scss b/src/KankaJournal/KankaJournalApplication.scss
@@ -3,6 +3,10 @@
         user-select: text;
     }
 
+    img {
+        cursor: pointer;
+    }
+
     .write-action {
         display: none;
     }

diff --git a/src/KankaJournal/KankaJournalApplication.ts b/src/KankaJournal/KankaJournalApplication.ts
@@ -89,6 +89,19 @@ export default function registerSheet(kanka: KankaFoundry): void {
             super.activateListeners(html);
             if (!this.isKankaEntry) return;
 
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            if (game.version?.startsWith('9.')) {
+                // This is a fallback for Foundry V9. Sicne V10 this seems to be the deault
+                html.on('click', 'img', (event) => {
+                    const target = event.currentTarget;
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore
+                    const ip = new ImagePopout(target.src, { title: target.title, shareable: true });
+                    ip.render(true);
+                });
+            }
+
             html.on('click', '[data-action]', async (event) => {
                 const { action } = event.currentTarget?.dataset ?? {};
 
@@ -103,14 +116,6 @@ export default function registerSheet(kanka: KankaFoundry): void {
                     await kanka.journals.write(campaign, [{ child_id: snapshot.id, type }]);
                     this.rerender();
                 }
-
-                if (action === 'show-image') {
-                    const target = event.currentTarget;
-                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                    // @ts-ignore
-                    const ip = new ImagePopout(target.src, { title: target.title, shareable: true });
-                    ip.render(true);
-                }
             });
         }
 

diff --git a/src/KankaJournal/shared/baseLayout.partial.hbs b/src/KankaJournal/shared/baseLayout.partial.hbs
@@ -71,7 +71,7 @@
             <div class="image-column">
                 {{~#if kankaEntity.image_full ~}}
                     {{~#if settings.imageInText~}}
-                        <input type="image" src="{{kankaEntity.image_full}}" alt="{{name}}" data-action="show-image">
+                        <img src="{{kankaEntity.image_full}}" alt="{{name}}" />
                     {{~/if~}}
                 {{~/if~}}
 

diff --git a/src/KankaJournal/shared/tabs/attributes.partial.hbs b/src/KankaJournal/shared/tabs/attributes.partial.hbs
@@ -1,7 +1,7 @@
 {{#if image}}
     {{#if settings.imageInText}}
         <div class="image-column">
-            <input type="image" src="{{image}}" alt="{{name}}" data-action="show-image">
+            <img src="{{image}}" alt="{{name}}" />
         </div>
     {{/if}}
 {{/if}}

diff --git a/src/KankaJournal/shared/tabs/files.partial.hbs b/src/KankaJournal/shared/tabs/files.partial.hbs
@@ -1,19 +1,26 @@
 <div class="kanka-gallery">
     {{#each (kankaFilterAccessible entity.entity_assets)}}
         {{#if (kankaEq this.type_id 1)}}
-            <!-- File -->
-            <a href="{{ this.metadata.path }}" target="_blank"{{#if (kankaIsSecret this) }} class="-secret"{{/if}}>
-                {{#if (kankaEq this.metadata.type 'regex:^image/.*') }}
-                    <img src="{{this.metadata.path}}" alt="{{this.name}}" />
-                {{else}}
+        <!-- File -->
+            {{#if (kankaEq this.metadata.type 'regex:^image/.*') }}
+                <div class="interactive{{#if (kankaIsSecret this) }} -secret{{/if}}">
+                    <img src="{{this._url}}" alt="{{this.name}}" />
+                    <strong>
+                        {{#if (kankaIsSecret this) }}<i class="fas fa-lock fw"></i>{{/if}}
+                        {{ this.name }}
+                    </strong>
+                    <small>{{ kankaFileSize this.metadata.size }}</small>
+                </div>
+            {{else}}
+                <a href="{{this._url}}" target="_blank"{{#if (kankaIsSecret this) }} class="-secret"{{/if}}>
                     {{ kankaFileIcon this.metadata.type }}
-                {{/if}}
-                <strong>
-                    {{#if (kankaIsSecret this) }}<i class="fas fa-lock fw"></i>{{/if}}
-                    {{ this.name }}
-                </strong>
-                <small>{{ kankaFileSize this.metadata.size }}</small>
-            </a>
+                    <strong>
+                        {{#if (kankaIsSecret this) }}<i class="fas fa-lock fw"></i>{{/if}}
+                        {{ this.name }}
+                    </strong>
+                    <small>{{ kankaFileSize this.metadata.size }}</small>
+                </a>
+            {{/if}}
         {{else if (kankaEq this.type_id 2)}}
             <!-- Link -->
             <a href="{{ this.metadata.url }}" target="_blank"{{#if (kankaIsSecret this) }} class="-secret"{{/if}}>

diff --git a/src/index.scss b/src/index.scss
@@ -489,7 +489,7 @@ ul.kanka-cards {
         }
     }
 
-    a:hover {
+    a:hover, .interactive:hover {
         > img,
         > i {
             box-shadow: 0 0 1rem 0 #00000099;

diff --git a/src/types/kanka.ts b/src/types/kanka.ts
@@ -193,6 +193,7 @@ export interface KankaApiEntityAssetAlias extends KankaApiEntityBaseAsset {
 
 export interface KankaApiEntityAssetFile extends KankaApiEntityBaseAsset {
     type_id: KankaApiAssetType.file;
+    _url: string;
     metadata: {
         path: string;
         size: number;
-Original file line number
+Diff line change
@@ Expand Up / @@ -489,7 +489,7 @@ ul.kanka-cards { @@
             }
         }
-        a:hover {
+        a:hover, .interactive:hover {
             > img,
             > i {
                 box-shadow: 0 0 1rem 0 #00000099;
@@ Expand Down @@