mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict change resolution.

Browse Source
This commit is contained in:
Christiano, Kevin 2019-04-23 16:32:04 -04:00
parent 92c3f22ffe
commit 7d12e70d46
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MVMCoreUI/Atoms/Views/Label.swift
View File

@ -288,11 +288,9 @@ import MVMCore
// MARK: - Atomization // MARK: - Atomization
//------------------------------------------------------ //------------------------------------------------------
@objc public func setAsMolecule() {
}
@objc public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) { @objc public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
Label.setUILabel(self, withJSON: json, delegate: delegateObject, additionalData: additionalData) Label.setUILabel(self, withJSON: json, delegate: delegateObject, additionalData: additionalData)
originalAttributedString = attributedText
} }
} }

6
MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
View File

@ -103,12 +103,6 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
setup() 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 // MARK: - legacy
public init(frontText: String?, actionText: String?, backText: String?, actionBlock block: ActionBlock?) { public init(frontText: String?, actionText: String?, backText: String?, actionBlock block: ActionBlock?) {
super.init(frame: .zero) super.init(frame: .zero)