Merge branch 'develop' into feature/ONEAPP-2811-Tilet
This commit is contained in:
commit
fdc2628b19
@ -150,6 +150,9 @@ open class HeadlineBody: View {
|
|||||||
|
|
||||||
open override func reset() {
|
open override func reset() {
|
||||||
super.reset()
|
super.reset()
|
||||||
|
//Reset the text values
|
||||||
|
headlineLabel.reset()
|
||||||
|
messageLabel.reset()
|
||||||
stylePageHeader()
|
stylePageHeader()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,12 +7,12 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
|
|
||||||
@objcMembers public class ThreeLayerPageTemplateModel: ThreeLayerModelBase {
|
@objcMembers open class ThreeLayerPageTemplateModel: ThreeLayerModelBase {
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Properties
|
// MARK: - Properties
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|
||||||
public override class var identifier: String { "threeLayer" }
|
open override class var identifier: String { "threeLayer" }
|
||||||
public var middle: MoleculeModelProtocol?
|
public var middle: MoleculeModelProtocol?
|
||||||
|
|
||||||
public override var rootMolecules: [MoleculeModelProtocol] {
|
public override var rootMolecules: [MoleculeModelProtocol] {
|
||||||
@ -51,7 +51,7 @@
|
|||||||
try super.init(from: decoder)
|
try super.init(from: decoder)
|
||||||
}
|
}
|
||||||
|
|
||||||
public override func encode(to encoder: Encoder) throws {
|
open override func encode(to encoder: Encoder) throws {
|
||||||
try super.encode(to: encoder)
|
try super.encode(to: encoder)
|
||||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||||
try container.encodeModelIfPresent(header, forKey: .middle)
|
try container.encodeModelIfPresent(header, forKey: .middle)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user