From 32f85dfbf1a4d37b3355647152e034d6a2352664 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Mon, 13 Jan 2020 16:30:29 -0500 Subject: [PATCH] renamed func. changed location of action. --- MVMCoreUI/Atoms/Buttons/Link.swift | 3 +-- MVMCoreUI/BaseClasses/Button.swift | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MVMCoreUI/Atoms/Buttons/Link.swift b/MVMCoreUI/Atoms/Buttons/Link.swift index 550870fc..1ec7e9a3 100644 --- a/MVMCoreUI/Atoms/Buttons/Link.swift +++ b/MVMCoreUI/Atoms/Buttons/Link.swift @@ -80,8 +80,7 @@ import UIKit //-------------------------------------------------- open override func touchesEnded(_ touches: Set, with event: UIEvent?) { - - MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject) + callActionBlock(self) } } diff --git a/MVMCoreUI/BaseClasses/Button.swift b/MVMCoreUI/BaseClasses/Button.swift index 1d5d743e..55ac0195 100644 --- a/MVMCoreUI/BaseClasses/Button.swift +++ b/MVMCoreUI/BaseClasses/Button.swift @@ -64,10 +64,10 @@ public typealias ButtonBlock = (Button) -> () public func addBlock( event: Event, _ buttonBlock: @escaping ButtonBlock) { self.buttonBlock = buttonBlock - addTarget(self, action: #selector(callBlock(_:)), for: event) + addTarget(self, action: #selector(callActionBlock(_:)), for: event) } - func callBlock(_ sender: Button) { + func callActionBlock(_ sender: Button) { buttonBlock?(self) } @@ -90,6 +90,7 @@ public typealias ButtonBlock = (Button) -> () extension Button: MVMCoreUIMoleculeViewProtocol { public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) { + setWithActionMap(json, delegateObject: delegateObject, additionalData: additionalData) self.json = json guard let dictionary = json else { return }