Remove unused types

Insert image class for media and attachments

diff --git a/ts/WoltLabSuite/Core/Component/Ckeditor/Attachment.ts b/ts/WoltLabSuite/Core/Component/Ckeditor/Attachment.ts
index 3015ef596360fae8f64970507da67d7f8e352d68..43d05544843730cc73e0692a00d0508c5b6e5ade 100644 (file)
--- a/ts/WoltLabSuite/Core/Component/Ckeditor/Attachment.ts
+++ b/ts/WoltLabSuite/Core/Component/Ckeditor/Attachment.ts
@@ -58,7 +58,7 @@ function setupInsertAttachment(ckeditor: CKEditor): void {
       ckeditor.insertText(`[attach=${attachmentId}][/attach]`);
     } else {
       ckeditor.insertHtml(
-        `<img src="${url}" class="woltlabAttachment" data-attachment-id="${attachmentId.toString()}">`,
+        `<img src="${url}" class="image woltlabAttachment" data-attachment-id="${attachmentId.toString()}">`,
       );
     }
   });

diff --git a/ts/WoltLabSuite/Core/Component/Ckeditor/Media.ts b/ts/WoltLabSuite/Core/Component/Ckeditor/Media.ts
index 142e079c3aa4d7b10b8a30b957bc72f46a63a3f1..c47796a3b441eca09dcc2848b4e6789e39cb8e70 100644 (file)
--- a/ts/WoltLabSuite/Core/Component/Ckeditor/Media.ts
+++ b/ts/WoltLabSuite/Core/Component/Ckeditor/Media.ts
@@ -46,17 +46,6 @@ function uploadMedia(element: HTMLElement, file: File, abortController?: AbortCo
 export function setup(element: HTMLElement): void {
   listenToCkeditor(element)
     .setupConfiguration(({ configuration, features }) => {
-      configuration.woltlabMedia = {
-        resolveMediaUrl(mediaId: number, mediaSize: string) {
-          let thumbnail = "";
-          if (mediaSize !== "original") {
-            thumbnail = `&thumbnail=${mediaSize}`;
-          }
-
-          return `${window.WSC_API_URL}index.php?media/${mediaId}/${thumbnail}`;
-        },
-      };
-
       if (features.attachment || !features.media) {
         return;
       }

diff --git a/ts/WoltLabSuite/Core/Media/Manager/Editor.ts b/ts/WoltLabSuite/Core/Media/Manager/Editor.ts
index ecd07839b26222ef139713a7cba174c98c44c0a4..916b0b38d921d5669b0ebe9999588546c44b3526 100644 (file)
--- a/ts/WoltLabSuite/Core/Media/Manager/Editor.ts
+++ b/ts/WoltLabSuite/Core/Media/Manager/Editor.ts
@@ -266,7 +266,7 @@ export class MediaManagerEditor extends MediaManager<MediaManagerEditorOptions>
       }
 
       ckeditor.insertHtml(
-        `<img src="${escapeHTML(link)}" class="woltlabSuiteMedia" data-media-id="${
+        `<img src="${escapeHTML(link)}" class="image woltlabSuiteMedia" data-media-id="${
           media.mediaID
         }" data-media-size="${escapeHTML(thumbnailSize)}">`,
       );

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Attachment.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Attachment.js
index e8bbb63c6cfa1194b5fbfec10b3ed173747872e9..47179c2a288a4d91555cfec517045cf05dc6a03e 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Attachment.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Attachment.js
@@ -31,7 +31,7 @@ define(["require", "exports", "./Event"], function (require, exports, Event_1) {
                 ckeditor.insertText(`[attach=${attachmentId}][/attach]`);
             }
             else {
-                ckeditor.insertHtml(`<img src="${url}" class="woltlabAttachment" data-attachment-id="${attachmentId.toString()}">`);
+                ckeditor.insertHtml(`<img src="${url}" class="image woltlabAttachment" data-attachment-id="${attachmentId.toString()}">`);
             }
         });
     }

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Media.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Media.js
index d0378752867870922b169754087e4ddc40440663..a60af03cbc5cd916db201d3e78f2d21e235a2a0b 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Media.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Media.js
@@ -48,15 +48,6 @@ define(["require", "exports", "./Event"], function (require, exports, Event_1) {
     function setup(element) {
         (0, Event_1.listenToCkeditor)(element)
             .setupConfiguration(({ configuration, features }) => {
-            configuration.woltlabMedia = {
-                resolveMediaUrl(mediaId, mediaSize) {
-                    let thumbnail = "";
-                    if (mediaSize !== "original") {
-                        thumbnail = `&thumbnail=${mediaSize}`;
-                    }
-                    return `${window.WSC_API_URL}index.php?media/${mediaId}/${thumbnail}`;
-                },
-            };
             if (features.attachment || !features.media) {
                 return;
             }

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Editor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Editor.js
index 3e39eba1aa4ea6205283ee96ad57ede612d63f63..20b63472c2c51f51db2112be9ddc0400d3945947 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Editor.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Editor.js
@@ -218,7 +218,7 @@ define(["require", "exports", "tslib", "./Base", "../../Core", "../../Event/Hand
                 if (thumbnailSize !== "original") {
                     link = media[thumbnailSize + "ThumbnailLink"];
                 }
-                ckeditor.insertHtml(`<img src="${(0, StringUtil_1.escapeHTML)(link)}" class="woltlabSuiteMedia" data-media-id="${media.mediaID}" data-media-size="${(0, StringUtil_1.escapeHTML)(thumbnailSize)}">`);
+                ckeditor.insertHtml(`<img src="${(0, StringUtil_1.escapeHTML)(link)}" class="image woltlabSuiteMedia" data-media-id="${media.mediaID}" data-media-size="${(0, StringUtil_1.escapeHTML)(thumbnailSize)}">`);
             }
             else {
                 ckeditor.insertText(`[wsm='${media.mediaID}'][/wsm]`);