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

remove !

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-01-16 16:17:36 -05:00
parent 7d5bee5654
commit cb89795b4c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MVMCoreUI/Organisms/Stack.swift
View File

@ -107,12 +107,11 @@ open class Stack<T>: Container where T: StackModelProtocol {
}
open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
if model == nil {
let data = try! JSONSerialization.data(withJSONObject: json!)
let decoder = JSONDecoder()
let model = try! decoder.decode(MoleculeStackModel.self, from: data)
if let model = model {
setWithModel(model, delegateObject, additionalData)
} else {
} else if let json = json,
let data = try? JSONSerialization.data(withJSONObject: json),
let model = try? JSONDecoder().decode(MoleculeStackModel.self, from: data) {
setWithModel(model, delegateObject, additionalData)
}
}
@ -182,7 +181,7 @@ open class Stack<T>: Container where T: StackModelProtocol {
/// Adds the stack item view
func addView(_ view: UIView,_ model: StackItemModelProtocol, lastItem: Bool) {
let stackModel = self.stackModel!
guard let stackModel = self.stackModel else { return }
guard !model.gone else {
// Gone views do not show
stackItems.append(view)