From af7e813e1842eda760e283aee65bee91f226a096 Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Fri, 24 Jan 2020 10:41:38 -0500
Subject: [PATCH] model reuse again

---
 MVMCoreUI/Atoms/TextFields/TextEntryField.swift     | 13 +++----------
 .../Containers/views/EntryFieldContainer.swift      | 12 ++++++++++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/MVMCoreUI/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
index 1230a485..66f3ecd4 100644
--- a/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
@@ -277,19 +277,12 @@ import UIKit
         guard let model = model as? TextEntryFieldModel else { return }
         
         FormValidator.setupValidation(molecule: self, delegate: delegateObject?.formValidationProtocol)
-        
-        if let enabledTextColor = model.enabledTextColor {
-            textColor.enabled = enabledTextColor.uiColor
-        }
-        
-        if let disabledTextColor = model.disabledTextColor {
-            textColor.disabled = disabledTextColor.uiColor
-        }
-        
+       
+        textColor.enabled = model.enabledTextColor?.uiColor
+        textColor.disabled = model.disabledTextColor?.uiColor
         text = model.text
         placeholder = model.placeholder
         
-        
         switch model.type {
         case "password":
             textField.isSecureTextEntry = true
diff --git a/MVMCoreUI/Containers/views/EntryFieldContainer.swift b/MVMCoreUI/Containers/views/EntryFieldContainer.swift
index 96a51a8f..3f80006a 100644
--- a/MVMCoreUI/Containers/views/EntryFieldContainer.swift
+++ b/MVMCoreUI/Containers/views/EntryFieldContainer.swift
@@ -118,7 +118,7 @@ import UIKit
     //--------------------------------------------------
     
     /// Holds reference to delegateObject to inform molecular tableView of an update.
-    weak var delegateObject: MVMCoreUIDelegateObject?
+    var delegateObject: MVMCoreUIDelegateObject?
     
     //--------------------------------------------------
     // MARK: - Lifecycle
@@ -271,9 +271,17 @@ import UIKit
             layoutIfNeeded()
         }
     }
+    
+    //--------------------------------------------------
+    // MARK: - MVMCoreUIMoleculeViewProtocol
+    //--------------------------------------------------
+    
+    open override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.setWithModel(model, delegateObject, additionalData)
+        self.delegateObject = delegateObject
+    }
 }
 
-// MARK:- MVMCoreUIMoleculeViewProtocol
 extension EntryFieldContainer {
     
     override open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {