From 5b52679a74610be7e7dc2ce431c2c1ef19628f3b Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Wed, 9 Dec 2020 17:34:32 +0100 Subject: [PATCH] Convert `Form/Builder/Field/RadioButton` to TypeScript --- .../Core/Form/Builder/Field/RadioButton.js | 56 ++++++++----------- .../Core/Form/Builder/Field/RadioButton.js | 45 --------------- .../Core/Form/Builder/Field/RadioButton.ts | 38 +++++++++++++ 3 files changed, 61 insertions(+), 78 deletions(-) delete mode 100644 wcfsetup/install/files/ts/WoltLabSuite/Core/Form/Builder/Field/RadioButton.js create mode 100644 wcfsetup/install/files/ts/WoltLabSuite/Core/Form/Builder/Field/RadioButton.ts diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/RadioButton.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/RadioButton.js index 86c47e1f02..d647b149be 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/RadioButton.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/RadioButton.js @@ -1,41 +1,31 @@ /** * Data handler for a radio button form builder field in an Ajax form. * - * @author Matthias Schmidt - * @copyright 2001-2019 WoltLab GmbH - * @license GNU Lesser General Public License - * @module WoltLabSuite/Core/Form/Builder/Field/RadioButton - * @since 5.2 + * @author Matthias Schmidt + * @copyright 2001-2020 WoltLab GmbH + * @license GNU Lesser General Public License + * @module WoltLabSuite/Core/Form/Builder/Field/RadioButton + * @since 5.2 */ -define(['Core', './Field'], function (Core, FormBuilderField) { +define(["require", "exports", "tslib", "./Field", "../../../Core"], function (require, exports, tslib_1, Field_1, Core) { "use strict"; - /** - * @constructor - */ - function FormBuilderFieldRadioButton(fieldId) { - this.init(fieldId); - } - ; - Core.inherit(FormBuilderFieldRadioButton, FormBuilderField, { - /** - * @see WoltLabSuite/Core/Form/Builder/Field/Field#getData - */ - _getData: function () { - var data = {}; - for (var i = 0, length = this._fields.length; i < length; i++) { - if (this._fields[i].checked) { - data[this._fieldId] = this._fields[i].value; - break; + Field_1 = tslib_1.__importDefault(Field_1); + Core = tslib_1.__importStar(Core); + class RadioButton extends Field_1.default { + _getData() { + const data = {}; + this._fields.some((input) => { + if (input.checked) { + data[this._fieldId] = input.value; + return true; } - } + }); return data; - }, - /** - * @see WoltLabSuite/Core/Form/Builder/Field/Field#_readField - */ - _readField: function () { - this._fields = elBySelAll('input[name=' + this._fieldId + ']'); - }, - }); - return FormBuilderFieldRadioButton; + } + _readField() { + this._fields = Array.from(document.querySelectorAll("input[name=" + this._fieldId + "]")); + } + } + Core.enableLegacyInheritance(RadioButton); + return RadioButton; }); diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Form/Builder/Field/RadioButton.js b/wcfsetup/install/files/ts/WoltLabSuite/Core/Form/Builder/Field/RadioButton.js deleted file mode 100644 index b08f6b6f2f..0000000000 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Form/Builder/Field/RadioButton.js +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Data handler for a radio button form builder field in an Ajax form. - * - * @author Matthias Schmidt - * @copyright 2001-2019 WoltLab GmbH - * @license GNU Lesser General Public License - * @module WoltLabSuite/Core/Form/Builder/Field/RadioButton - * @since 5.2 - */ -define(['Core', './Field'], function(Core, FormBuilderField) { - "use strict"; - - /** - * @constructor - */ - function FormBuilderFieldRadioButton(fieldId) { - this.init(fieldId); - }; - Core.inherit(FormBuilderFieldRadioButton, FormBuilderField, { - /** - * @see WoltLabSuite/Core/Form/Builder/Field/Field#getData - */ - _getData: function() { - var data = {}; - - for (var i = 0, length = this._fields.length; i < length; i++) { - if (this._fields[i].checked) { - data[this._fieldId] = this._fields[i].value; - break; - } - } - - return data; - }, - - /** - * @see WoltLabSuite/Core/Form/Builder/Field/Field#_readField - */ - _readField: function() { - this._fields = elBySelAll('input[name=' + this._fieldId + ']'); - }, - }); - - return FormBuilderFieldRadioButton; -}); diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Form/Builder/Field/RadioButton.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Form/Builder/Field/RadioButton.ts new file mode 100644 index 0000000000..be54ac8091 --- /dev/null +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Form/Builder/Field/RadioButton.ts @@ -0,0 +1,38 @@ +/** + * Data handler for a radio button form builder field in an Ajax form. + * + * @author Matthias Schmidt + * @copyright 2001-2020 WoltLab GmbH + * @license GNU Lesser General Public License + * @module WoltLabSuite/Core/Form/Builder/Field/RadioButton + * @since 5.2 + */ + +import Field from "./Field"; +import { FormBuilderData } from "../Data"; +import * as Core from "../../../Core"; + +class RadioButton extends Field { + protected _fields: HTMLInputElement[]; + + protected _getData(): FormBuilderData { + const data = {}; + + this._fields.some((input) => { + if (input.checked) { + data[this._fieldId] = input.value; + return true; + } + }); + + return data; + } + + protected _readField(): void { + this._fields = Array.from(document.querySelectorAll("input[name=" + this._fieldId + "]")); + } +} + +Core.enableLegacyInheritance(RadioButton); + +export = RadioButton; -- 2.20.1