Fix editing newly uploaded media files

diff --git a/ts/WoltLabSuite/Core/Media/Editor.ts b/ts/WoltLabSuite/Core/Media/Editor.ts
index 89168e04a720c2c161626a55d2738ab2e4abcf17..f4254165c3d1bd1ea637afe50d46920e763416c3 100644 (file)
--- a/ts/WoltLabSuite/Core/Media/Editor.ts
+++ b/ts/WoltLabSuite/Core/Media/Editor.ts
@@ -95,21 +95,19 @@ class MediaEditor implements AjaxCallbackObject {
     if (data.returnValues.mediaData) {
       this._media = data.returnValues.mediaData;
     }
-    const mediaId = this._media!.mediaID;
+    const media = this._media!;
+    const mediaId = media.mediaID;
 
     // make sure that the language chooser is initialized first
     setTimeout(() => {
       if (this._availableLanguageCount > 1) {
-        LanguageChooser.setLanguageId(
-          `mediaEditor_${mediaId}_languageID`,
-          this._media!.languageID || window.LANGUAGE_ID,
-        );
+        LanguageChooser.setLanguageId(`mediaEditor_${mediaId}_languageID`, media.languageID || window.LANGUAGE_ID);
       }
 
       if (this._categoryIds.length) {
         const categoryID = content.querySelector("select[name=categoryID]") as HTMLSelectElement;
-        if (this._media!.categoryID) {
-          categoryID.value = this._media!.categoryID.toString();
+        if (media.categoryID) {
+          categoryID.value = media.categoryID.toString();
         } else {
           categoryID.value = "0";
         }
@@ -119,23 +117,23 @@ class MediaEditor implements AjaxCallbackObject {
       const altText = content.querySelector("input[name=altText]") as HTMLInputElement;
       const caption = content.querySelector("textarea[name=caption]") as HTMLInputElement;
 
-      if (this._availableLanguageCount > 1 && this._media!.isMultilingual) {
+      if (this._availableLanguageCount > 1 && media.isMultilingual) {
         if (document.getElementById(`altText_${mediaId}`)) {
-          LanguageInput.setValues(`altText_${mediaId}`, (this._media!.altText || {}) as I18nValues);
+          LanguageInput.setValues(`altText_${mediaId}`, (media.altText || {}) as I18nValues);
         }
 
         if (document.getElementById(`caption_${mediaId}`)) {
-          LanguageInput.setValues(`caption_${mediaId}`, (this._media!.caption || {}) as I18nValues);
+          LanguageInput.setValues(`caption_${mediaId}`, (media.caption || {}) as I18nValues);
         }
 
-        LanguageInput.setValues(`title_${mediaId}`, (this._media!.title || {}) as I18nValues);
+        LanguageInput.setValues(`title_${mediaId}`, (media.title || {}) as I18nValues);
       } else {
-        title.value = this._media?.title[this._media.languageID || window.LANGUAGE_ID] || "";
+        title.value = media.title ? media.title[media.languageID || window.LANGUAGE_ID] : "";
         if (altText) {
-          altText.value = this._media?.altText[this._media.languageID || window.LANGUAGE_ID] || "";
+          altText.value = media.altText ? media.altText[media.languageID || window.LANGUAGE_ID] : "";
         }
         if (caption) {
-          caption.value = this._media?.caption[this._media.languageID || window.LANGUAGE_ID] || "";
+          caption.value = media.caption ? media.caption[media.languageID || window.LANGUAGE_ID] : "";
         }
       }
 

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js
index ac7f7423c26ec3aefd49c9c43f759e7c0a8a8415..32c912021ca422088b3a518aa6533873af56365c 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js
@@ -71,17 +71,17 @@ define(["require", "exports", "tslib", "../Core", "../Ui/Notification", "../Ui/D
             if (data.returnValues.mediaData) {
                 this._media = data.returnValues.mediaData;
             }
-            const mediaId = this._media.mediaID;
+            const media = this._media;
+            const mediaId = media.mediaID;
             // make sure that the language chooser is initialized first
             setTimeout(() => {
-                var _a, _b, _c;
                 if (this._availableLanguageCount > 1) {
-                    LanguageChooser.setLanguageId(`mediaEditor_${mediaId}_languageID`, this._media.languageID || window.LANGUAGE_ID);
+                    LanguageChooser.setLanguageId(`mediaEditor_${mediaId}_languageID`, media.languageID || window.LANGUAGE_ID);
                 }
                 if (this._categoryIds.length) {
                     const categoryID = content.querySelector("select[name=categoryID]");
-                    if (this._media.categoryID) {
-                        categoryID.value = this._media.categoryID.toString();
+                    if (media.categoryID) {
+                        categoryID.value = media.categoryID.toString();
                     }
                     else {
                         categoryID.value = "0";
@@ -90,22 +90,22 @@ define(["require", "exports", "tslib", "../Core", "../Ui/Notification", "../Ui/D
                 const title = content.querySelector("input[name=title]");
                 const altText = content.querySelector("input[name=altText]");
                 const caption = content.querySelector("textarea[name=caption]");
-                if (this._availableLanguageCount > 1 && this._media.isMultilingual) {
+                if (this._availableLanguageCount > 1 && media.isMultilingual) {
                     if (document.getElementById(`altText_${mediaId}`)) {
-                        LanguageInput.setValues(`altText_${mediaId}`, (this._media.altText || {}));
+                        LanguageInput.setValues(`altText_${mediaId}`, (media.altText || {}));
                     }
                     if (document.getElementById(`caption_${mediaId}`)) {
-                        LanguageInput.setValues(`caption_${mediaId}`, (this._media.caption || {}));
+                        LanguageInput.setValues(`caption_${mediaId}`, (media.caption || {}));
                     }
-                    LanguageInput.setValues(`title_${mediaId}`, (this._media.title || {}));
+                    LanguageInput.setValues(`title_${mediaId}`, (media.title || {}));
                 }
                 else {
-                    title.value = ((_a = this._media) === null || _a === void 0 ? void 0 : _a.title[this._media.languageID || window.LANGUAGE_ID]) || "";
+                    title.value = media.title ? media.title[media.languageID || window.LANGUAGE_ID] : "";
                     if (altText) {
-                        altText.value = ((_b = this._media) === null || _b === void 0 ? void 0 : _b.altText[this._media.languageID || window.LANGUAGE_ID]) || "";
+                        altText.value = media.altText ? media.altText[media.languageID || window.LANGUAGE_ID] : "";
                     }
                     if (caption) {
-                        caption.value = ((_c = this._media) === null || _c === void 0 ? void 0 : _c.caption[this._media.languageID || window.LANGUAGE_ID]) || "";
+                        caption.value = media.caption ? media.caption[media.languageID || window.LANGUAGE_ID] : "";
                     }
                 }
                 if (this._availableLanguageCount > 1) {