From 76506a51b51c961be17c342a73e0c5a534ee1ddd Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Tue, 16 Apr 2019 15:33:34 -0400 Subject: [PATCH 1/3] ONVIK-14895 --- MVMCoreUI/Atoms/TextFields/MFTextField.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Atoms/TextFields/MFTextField.m b/MVMCoreUI/Atoms/TextFields/MFTextField.m index 565e086c..fb157764 100644 --- a/MVMCoreUI/Atoms/TextFields/MFTextField.m +++ b/MVMCoreUI/Atoms/TextFields/MFTextField.m @@ -561,7 +561,7 @@ - (void)setWithJSON:(NSDictionary *)json delegate:(nullable id)delegate additionalData:(NSDictionary *)additionalData { [FormValidator setupValidationWithMolecule:self delegate:(id)delegate]; FormValidator *formValidator = [FormValidator getFormValidatorForDelegate:(id)delegate]; - [self setWithMap:json bothDelegates:formValidator]; + [self setWithMap:json bothDelegates: formValidator ?: delegate ]; } #pragma mark - FormValidationProtocol From 3655b4af8d7ae3c6f2c29b14074891b6ffb096fc Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Tue, 16 Apr 2019 15:51:15 -0400 Subject: [PATCH 2/3] remove space --- MVMCoreUI/Atoms/TextFields/MFTextField.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Atoms/TextFields/MFTextField.m b/MVMCoreUI/Atoms/TextFields/MFTextField.m index fb157764..fa5a1506 100644 --- a/MVMCoreUI/Atoms/TextFields/MFTextField.m +++ b/MVMCoreUI/Atoms/TextFields/MFTextField.m @@ -561,7 +561,7 @@ - (void)setWithJSON:(NSDictionary *)json delegate:(nullable id)delegate additionalData:(NSDictionary *)additionalData { [FormValidator setupValidationWithMolecule:self delegate:(id)delegate]; FormValidator *formValidator = [FormValidator getFormValidatorForDelegate:(id)delegate]; - [self setWithMap:json bothDelegates: formValidator ?: delegate ]; + [self setWithMap:json bothDelegates:formValidator ?: delegate]; } #pragma mark - FormValidationProtocol From 53502a40c103cad5df8a2d1553ed4c4417acfc59 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Wed, 17 Apr 2019 10:59:16 -0400 Subject: [PATCH 3/3] merge --- MVMCoreUI/Atoms/TextFields/MFTextField.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Atoms/TextFields/MFTextField.m b/MVMCoreUI/Atoms/TextFields/MFTextField.m index 6fb728b2..065c1439 100644 --- a/MVMCoreUI/Atoms/TextFields/MFTextField.m +++ b/MVMCoreUI/Atoms/TextFields/MFTextField.m @@ -116,7 +116,7 @@ + (nullable instancetype)mfTextFieldWithMap:(nullable NSDictionary *)map bothDelegates:(nullable id)delegate { MFTextField *textField = [self mfTextField]; textField.translatesAutoresizingMaskIntoConstraints = NO; - [textField setWithJSON:map delegateObject:[MVMCoreUIDelegateObject createWithDelegateForAll:delegate] additionalData:nil]; + [textField setWithMap:map bothDelegates:delegate]; return textField; } @@ -562,7 +562,7 @@ if ([delegateObject isKindOfClass:[MVMCoreUIDelegateObject class]]) { [FormValidator setupValidationWithMolecule:self delegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol]; FormValidator *formValidator = [FormValidator getFormValidatorForDelegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol]; - [self setWithMap:json bothDelegates:formValidator ?: delegate]; + [self setWithMap:json bothDelegates:formValidator]; } }