Open original media in new tab instead of canvas

yomidevs · Dec 27, 2024 · 2fed539 · 2fed539
1 parent 7c1a454
commit 2fed539
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/ext/js/display/display-content-manager.js b/ext/js/display/display-content-manager.js
@@ -17,6 +17,7 @@
  */
 
 import {EventListenerCollection} from '../core/event-listener-collection.js';
+import {base64ToArrayBuffer} from '../data/array-buffer-util.js';
 
 /**
  * The content manager which is used when generating HTML display content.
@@ -86,6 +87,19 @@ export class DisplayContentManager {
         this._loadMediaRequests = [];
     }
 
+    /**
+     * @param {string} path
+     * @param {string} dictionary
+     * @param {Window} window
+     */
+    async openMediaInTab(path, dictionary, window) {
+        const data = await this._display.application.api.getMedia([{path, dictionary}]);
+        const buffer = base64ToArrayBuffer(data[0].content);
+        const blob = new Blob([buffer], {type: data[0].mediaType});
+        const blobUrl = URL.createObjectURL(blob);
+        window.open(blobUrl, '_blank')?.focus();
+    }
+
     /**
      * @param {MouseEvent} e
      */

diff --git a/ext/js/display/structured-content-generator.js b/ext/js/display/structured-content-generator.js
@@ -113,15 +113,8 @@ export class StructuredContentGenerator {
 
         if (this._contentManager instanceof DisplayContentManager) {
             node.addEventListener('click', () => {
-                /** @type {HTMLCanvasElement | null} */
-                const canvasElement = imageContainer.querySelector('.gloss-image');
-                if (canvasElement) {
-                    canvasElement.toBlob((blob) => {
-                        if (blob) {
-                            const blobUrl = URL.createObjectURL(blob);
-                            window.open(blobUrl, '_blank')?.focus();
-                        }
-                    });
+                if (this._contentManager instanceof DisplayContentManager) {
+                    void this._contentManager.openMediaInTab(path, dictionary, window);
                 }
             });
         }