Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unified_grid
This commit is contained in:
commit
7d68149853
@ -80,8 +80,8 @@
|
|||||||
|
|
||||||
// MARK: - UITabBarDelegate
|
// MARK: - UITabBarDelegate
|
||||||
public func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
|
public func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
|
||||||
guard item.tag != tabBar.selectedItem?.tag else { return }
|
guard model.selectedTab != tabBar.selectedItem?.tag else { return }
|
||||||
self.model.selectedTab = item.tag
|
model.selectedTab = item.tag
|
||||||
Button.performButtonAction(with: model.tabs[item.tag].action, button: item, delegateObject: delegateObject, additionalData: nil)
|
Button.performButtonAction(with: model.tabs[item.tag].action, button: item, delegateObject: delegateObject, additionalData: nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -96,8 +96,7 @@
|
|||||||
|
|
||||||
public func selectTab(at index: Int) {
|
public func selectTab(at index: Int) {
|
||||||
MVMCoreDispatchUtility.performBlock(onMainThread: {
|
MVMCoreDispatchUtility.performBlock(onMainThread: {
|
||||||
guard index != self.selectedItem?.tag,
|
guard let newSelectedItem = self.items?[index] else { return }
|
||||||
let newSelectedItem = self.items?[index] else { return }
|
|
||||||
self.selectedItem = newSelectedItem
|
self.selectedItem = newSelectedItem
|
||||||
self.tabBar(self, didSelect: newSelectedItem)
|
self.tabBar(self, didSelect: newSelectedItem)
|
||||||
})
|
})
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user