1.2.3 Dev 1

- Modified `fromversion` in package.xml to support upgrading from every version
- Removed unused update script
- Fixed/Removed references to VieCode Shop in Upload.ts
- Removed non-functional/obsolete MCRecurringElementsFormDataProcessor
- Added dedicated Attachment.ts

Signed-off-by: Sascha Greuel <github@1-2.dev>

Author: SoftCreatR

files/acp/update_de.mysterycode.wcf.formBuilder.extension.php

@@ -0,0 +1,21 @@
+/**
+ * Data handler for a wysiwyg attachment form builder field that stores the temporary hash.
+ *
+ * @author  Matthias Schmidt
+ * @copyright 2001-2020 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module  MysteryCode/Form/Builder/Field/Field/Wysiwyg/Attachment
+ * @since 5.2
+ */
+define(["require", "exports", "tslib", "WoltLabSuite/Core/Form/Builder/Field/Value", "WoltLabSuite/Core/Core"], function (require, exports, tslib_1, Value_1, Core) {
+    "use strict";
+    Value_1 = tslib_1.__importDefault(Value_1);
+    Core = tslib_1.__importStar(Core);
+    class Attachment extends Value_1.default {
+        constructor(fieldId) {
+            super(fieldId + "_tmpHash");
+        }
+    }
+    Core.enableLegacyInheritance(Attachment);
+    return Attachment;
+});

files/js/MysteryCode/Form/Builder/Field/Wysiwyg/Attachment.js

@@ -22,7 +22,7 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Ajax", "WoltLabSuite/C
         constructor(buttonContainerId, targetId, objectType, objectID, tmpHash, parentObjectID, maxUploads, editorId, options) {
             super(buttonContainerId, targetId, Core.extend({
                 multiple: true,
-                className: "wcf\\data\\attachment\\VieCodeShopAttachmentAction",
+                className: "wcf\\data\\attachment\\AttachmentAction",
                 maxUploads: maxUploads,
                 singleFileRequests: true,
                 objectType: objectType,
@@ -216,14 +216,14 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Ajax", "WoltLabSuite/C
                 })
                     .then((resizedFile) => {
                     if (resizedFile.size > file.size) {
-                        console.debug(`[VieCode/Shop/Ui/Attachment/Upload] File size of "${file.name}" increased, uploading untouched image.`);
+                        console.debug(`[MysteryCode/Ui/Attachment/Upload] File size of "${file.name}" increased, uploading untouched image.`);
                         return file;
                     }
                     return resizedFile;
                 });
             })
                 .catch((error) => {
-                console.debug(`[VieCode/Shop/Ui/Attachment/Upload] Failed to resize image "${file.name}":`, error);
+                console.debug(`[MysteryCode/Ui/Attachment/Upload] Failed to resize image "${file.name}":`, error);
                 return file;
             })
                 .then((file) => {
@@ -318,7 +318,7 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Ajax", "WoltLabSuite/C
                                 Ajax.apiOnce({
                                     data: {
                                         actionName: "updatePosition",
-                                        className: "wcf\\data\\attachment\\VieCodeShopAttachmentAction",
+                                        className: "wcf\\data\\attachment\\AttachmentAction",
                                         parameters: {
                                             attachmentIDs: attachmentIDs,
                                             objectID: this._objectID,
@@ -467,8 +467,7 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Ajax", "WoltLabSuite/C
             if (innerError) {
                 innerError.remove();
             }
-            const result = super._upload(event, file, blob);
-            return result;
+            return super._upload(event, file, blob);
         }
         _createFileElement(file) {
             DomUtil.show(this._target);

files/js/MysteryCode/Ui/Attachment/Upload.js

@@ -5,8 +5,8 @@
 		<packagename language="de"><![CDATA[Form Builder: Erweiterung]]></packagename>
 		<packagedescription><![CDATA[Extension for the form builder API.]]></packagedescription>
 		<packagedescription language="de"><![CDATA[Erweiterung für die Form Builder-API.]]></packagedescription>
-		<version>1.2.2</version>
-		<date><![CDATA[2022-07-26]]></date>
+		<version>1.2.3 Dev 1</version>
+		<date><![CDATA[2022-07-27]]></date>
         <license><![CDATA[Lesser General Public License (LGPL)]]></license>
 	</packageinformation>
 
@@ -29,7 +29,7 @@
 		<instruction type="template" />
 	</instructions>
 
-	<instructions type="update" fromversion="1.*">
+	<instructions type="update" fromversion="*">
 		<instruction type="file" />
 		<instruction type="acpTemplate" />
 		<instruction type="template" />

files/lib/system/form/builder/data/processor/MCRecurringElementsFormDataProcessor.class.php

@@ -0,0 +1,22 @@
+/**
+ * Data handler for a wysiwyg attachment form builder field that stores the temporary hash.
+ *
+ * @author  Matthias Schmidt
+ * @copyright 2001-2020 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @module  MysteryCode/Form/Builder/Field/Field/Wysiwyg/Attachment
+ * @since 5.2
+ */
+
+import Value from "WoltLabSuite/Core/Form/Builder/Field/Value";
+import * as Core from "WoltLabSuite/Core/Core";
+
+class Attachment extends Value {
+  constructor(fieldId: string) {
+    super(fieldId + "_tmpHash");
+  }
+}
+
+Core.enableLegacyInheritance(Attachment);
+
+export = Attachment;

package.xml

@@ -59,7 +59,7 @@ export class AttachmentUpload extends Upload<AttachmentUploadOptions> implements
       Core.extend(
         {
           multiple: true,
-          className: "wcf\\data\\attachment\\VieCodeShopAttachmentAction",
+          className: "wcf\\data\\attachment\\AttachmentAction",
           maxUploads: maxUploads,
           singleFileRequests: true,
           objectType: objectType,
@@ -311,9 +311,7 @@ export class AttachmentUpload extends Upload<AttachmentUploadOptions> implements
           .then((resizedFile: File) => {
             if (resizedFile.size > file!.size) {
               console.debug(
-                `[VieCode/Shop/Ui/Attachment/Upload] File size of "${
-                  file!.name
-                }" increased, uploading untouched image.`,
+                `[MysteryCode/Ui/Attachment/Upload] File size of "${file!.name}" increased, uploading untouched image.`,
               );
               return file;
             }
@@ -322,7 +320,7 @@ export class AttachmentUpload extends Upload<AttachmentUploadOptions> implements
           });
       })
       .catch((error) => {
-        console.debug(`[VieCode/Shop/Ui/Attachment/Upload] Failed to resize image "${file!.name}":`, error);
+        console.debug(`[MysteryCode/Ui/Attachment/Upload] Failed to resize image "${file!.name}":`, error);
         return file;
       })
       .then((file) => {
@@ -436,7 +434,7 @@ export class AttachmentUpload extends Upload<AttachmentUploadOptions> implements
                 Ajax.apiOnce({
                   data: {
                     actionName: "updatePosition",
-                    className: "wcf\\data\\attachment\\VieCodeShopAttachmentAction",
+                    className: "wcf\\data\\attachment\\AttachmentAction",
                     parameters: {
                       attachmentIDs: attachmentIDs,
                       objectID: this._objectID,
@@ -622,9 +620,7 @@ export class AttachmentUpload extends Upload<AttachmentUploadOptions> implements
       innerError.remove();
     }
 
-    const result = super._upload(event, file, blob);
-
-    return result;
+    return super._upload(event, file, blob);
   }
 
   protected _createFileElement(file: File | FileLikeObject): HTMLElement {