diff --git a/ui/StatusQ/src/StatusQ/Controls/Validators/StatusRegularExpressionValidator.qml b/ui/StatusQ/src/StatusQ/Controls/Validators/StatusRegularExpressionValidator.qml index 7017f66422..ac4615af8b 100644 --- a/ui/StatusQ/src/StatusQ/Controls/Validators/StatusRegularExpressionValidator.qml +++ b/ui/StatusQ/src/StatusQ/Controls/Validators/StatusRegularExpressionValidator.qml @@ -28,7 +28,7 @@ StatusValidator { id: root /*! - \qmlproperty string StatusRegularExpressionValidator::regularExpression + \qmlproperty var StatusRegularExpressionValidator::regularExpression This property holds the regular expression used for validation. Note that this property should be a regular expression in JS syntax, e.g /a/ for the regular expression matching "a". @@ -50,11 +50,11 @@ StatusValidator { property var regularExpression name: "regex" - errorMessage: `Must match regex(${validatorObj.regularExpression.toString()})` + errorMessage: `Must match regex(${regularExpression.toString()})` validatorObj: RegularExpressionValidator { regularExpression: root.regularExpression } validate: function (value) { // Basic validation management - return root.validatorObj.regularExpression.test(value) + return root.regularExpression.test(value) } } diff --git a/ui/imports/shared/popups/NicknamePopup.qml b/ui/imports/shared/popups/NicknamePopup.qml index 6ac8f7d1d0..6db3372199 100644 --- a/ui/imports/shared/popups/NicknamePopup.qml +++ b/ui/imports/shared/popups/NicknamePopup.qml @@ -1,6 +1,8 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 +import DotherSide 0.1 + import utils 1.0 import shared.controls 1.0 @@ -61,7 +63,10 @@ StatusModal { validationMode: StatusInput.ValidationMode.IgnoreInvalidInput validators: [ StatusRegularExpressionValidator { - regularExpression: /^[0-9A-Za-z_-]*$/ + validatorObj: RXValidator { regularExpression: /^[\w\d_-]*$/u } + validate: function (value) { + return validatorObj.test(value) + } } ] Keys.onReleased: { diff --git a/vendor/DOtherSide b/vendor/DOtherSide index 328c56cee2..12907e411b 160000 --- a/vendor/DOtherSide +++ b/vendor/DOtherSide @@ -1 +1 @@ -Subproject commit 328c56cee2cbf3c41619cda54d820a653483b498 +Subproject commit 12907e411b5b5f1580a087f8235c7afc018f36e4