moved code to parent

This commit is contained in:
Kevin G Christiano 2020-05-15 13:56:57 -04:00
parent ad4dfcf748
commit 6a9957d348
4 changed files with 16 additions and 11 deletions

View File

@ -322,7 +322,7 @@ import UIKit
@objc override open func resignFirstResponder() -> Bool {
if validateWhenDoneEditing {
validateTextField()
validateText()
}
selectedDigitBox?.isSelected = false
@ -440,7 +440,7 @@ extension DigitEntryField {
selectedDigitBox = nil
if !switchFieldsAutomatically && validateWhenDoneEditing {
validateTextField()
validateText()
}
proprietorTextDelegate?.textFieldDidEndEditing?(textField)

View File

@ -236,6 +236,13 @@ import UIKit
// MARK: - Validation
//--------------------------------------------------
/// Validates the text of the entry field.
@objc public func validateText() {
if let isValid = FormValidator.validate(delegate: delegateObject?.formHolderDelegate) {
self.isValid = isValid
}
}
/// Executes on .textDidBeginEditingNotification
@objc func startEditing() {
isSelected = true

View File

@ -223,7 +223,7 @@ import UIKit
@discardableResult
@objc override open func resignFirstResponder() -> Bool {
if validateWhenDoneEditing {
validateTextField()
validateText()
}
textField.resignFirstResponder()
isSelected = false
@ -231,9 +231,9 @@ import UIKit
}
/// Validates the text of the entry field.
@objc public func validateTextField() {
@objc public override func validateText() {
text = textField.text
_ = FormValidator.validate(delegate: delegateObject?.formHolderDelegate)
super.validateText()
}
@objc public func updateValidation(_ isValid: Bool) {
@ -266,7 +266,7 @@ import UIKit
/// Executes on UITextField.textDidChangeNotification (each character entry)
@objc override func valueChanged() {
super.valueChanged()
validateTextField()
validateText()
}
/// Executes on UITextField.textDidEndEditingNotification

View File

@ -183,11 +183,9 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
//--------------------------------------------------
/// Validates the text of the entry field.
@objc public func validateTextView() {
@objc public override func validateText() {
text = textView.text
if let isValid = FormValidator.validate(delegate: delegateObject?.formHolderDelegate) {
self.isValid = isValid
}
super.validateText()
}
/// Executes on UITextView.textDidBeginEditingNotification
@ -199,7 +197,7 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
/// Executes on UITextView.textDidChangeNotification (each character entry)
@objc override func valueChanged() {
super.valueChanged()
validateTextView()
validateText()
}
/// Executes on UITextView.textDidEndEditingNotification