used new isEnabled in model
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
parent
c3290f83ba
commit
315eac1dac
@ -131,7 +131,7 @@ import VDS
|
|||||||
}
|
}
|
||||||
|
|
||||||
//properties
|
//properties
|
||||||
isEnabled = viewModel.enabled && !viewModel.readOnly
|
isEnabled = viewModel.isEnabled
|
||||||
isAnimated = viewModel.animated
|
isAnimated = viewModel.animated
|
||||||
|
|
||||||
//call super here to go around the didSet
|
//call super here to go around the didSet
|
||||||
|
|||||||
@ -101,7 +101,7 @@ import VDS
|
|||||||
}
|
}
|
||||||
|
|
||||||
isSelected = viewModel.state
|
isSelected = viewModel.state
|
||||||
isEnabled = viewModel.enabled && !viewModel.readOnly
|
isEnabled = viewModel.isEnabled
|
||||||
RadioButtonSelectionHelper.setupForRadioButtonGroup(viewModel, self, delegateObject: delegateObject)
|
RadioButtonSelectionHelper.setupForRadioButtonGroup(viewModel, self, delegateObject: delegateObject)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -29,7 +29,7 @@ open class RadioButtons: VDS.RadioButtonGroup, VDSMoleculeViewProtocol {
|
|||||||
// MARK: - MoleculeViewProtocol
|
// MARK: - MoleculeViewProtocol
|
||||||
public func viewModelDidUpdate() {
|
public func viewModelDidUpdate() {
|
||||||
showError = viewModel.showError
|
showError = viewModel.showError
|
||||||
isEnabled = viewModel.enabled && !viewModel.readOnly
|
isEnabled = viewModel.isEnabled
|
||||||
surface = viewModel.surface
|
surface = viewModel.surface
|
||||||
|
|
||||||
radioButtons = viewModel.radioButtons
|
radioButtons = viewModel.radioButtons
|
||||||
|
|||||||
@ -108,7 +108,7 @@ public typealias ActionBlockConfirmation = () -> (Bool)
|
|||||||
isOn = viewModel.selected
|
isOn = viewModel.selected
|
||||||
surface = viewModel.surface
|
surface = viewModel.surface
|
||||||
isAnimated = viewModel.animated
|
isAnimated = viewModel.animated
|
||||||
isEnabled = viewModel.enabled && !viewModel.readOnly
|
isEnabled = viewModel.isEnabled
|
||||||
showText = viewModel.showText
|
showText = viewModel.showText
|
||||||
if let onText = viewModel.onText {
|
if let onText = viewModel.onText {
|
||||||
self.onText = onText
|
self.onText = onText
|
||||||
|
|||||||
@ -64,7 +64,7 @@ import VDS
|
|||||||
|
|
||||||
//properties
|
//properties
|
||||||
isAnimated = viewModel.checkbox.animated
|
isAnimated = viewModel.checkbox.animated
|
||||||
isEnabled = viewModel.checkbox.enabled && !viewModel.checkbox.readOnly
|
isEnabled = viewModel.checkbox.isEnabled
|
||||||
|
|
||||||
//call super here to go around the didSet
|
//call super here to go around the didSet
|
||||||
//in this class
|
//in this class
|
||||||
@ -78,7 +78,7 @@ import VDS
|
|||||||
//TODO: Fix issue with default state
|
//TODO: Fix issue with default state
|
||||||
//showError = !isValid
|
//showError = !isValid
|
||||||
errorText = viewModel.checkbox.errorMessage
|
errorText = viewModel.checkbox.errorMessage
|
||||||
isEnabled = viewModel.checkbox.enabled
|
isEnabled = viewModel.checkbox.isEnabled
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user