From 7d12e70d46cca832232dfd0ec4f60d70e4fc9d08 Mon Sep 17 00:00:00 2001 From: "Christiano, Kevin" Date: Tue, 23 Apr 2019 16:32:04 -0400 Subject: [PATCH] conflict change resolution. --- MVMCoreUI/Atoms/Views/Label.swift | 6 ++---- MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift | 6 ------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/Label.swift b/MVMCoreUI/Atoms/Views/Label.swift index e939120f..e6a27d8e 100644 --- a/MVMCoreUI/Atoms/Views/Label.swift +++ b/MVMCoreUI/Atoms/Views/Label.swift @@ -288,11 +288,9 @@ import MVMCore // MARK: - Atomization //------------------------------------------------------ - @objc public func setAsMolecule() { - - } - @objc public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) { Label.setUILabel(self, withJSON: json, delegate: delegateObject, additionalData: additionalData) + + originalAttributedString = attributedText } } diff --git a/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift b/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift index 5db5dc34..f5de79b6 100644 --- a/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift +++ b/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift @@ -103,12 +103,6 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt setup() } - public init(frontText: String?, actionText: String?, backText: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) { - super.init(frame: .zero) - - setFrontText(frontText, actionText: actionText, actionMap: actionMap, backText: backText, additionalData: additionalData, delegate: delegate, buttonDelegate: buttonDelegate) - } - // MARK: - legacy public init(frontText: String?, actionText: String?, backText: String?, actionBlock block: ActionBlock?) { super.init(frame: .zero)