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

Merge branch 'bugfix/CXTDT-198773' into 'release/9_1_0'

Browse Source 
weak managers

See merge request BPHV_MIPS/mvm_core_ui!745
This commit is contained in:
Pfeil, Scott Robert 2021-07-23 19:44:36 +00:00
commit 0f0f526885
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atomic/Protocols/MoleculeTreeTraversalProtocol.swift
View File

@ -28,7 +28,7 @@ public protocol MoleculeTreeTraversalProtocol {
// Helper Extensions // Helper Extensions
// //
extension MoleculeTreeTraversalProtocol { public extension MoleculeTreeTraversalProtocol {
func countMolecules(options: TreeTraversalOptions = .parentFirst) -> Int { func countMolecules(options: TreeTraversalOptions = .parentFirst) -> Int {
return reduceDepthFirstTraverse(options: options, depth: 0, initialResult: 0) { (accumulator, molecule, depth) in return reduceDepthFirstTraverse(options: options, depth: 0, initialResult: 0) { (accumulator, molecule, depth) in

2
MVMCoreUI/Atomic/Templates/CollectionTemplate.swift
View File

@ -66,7 +66,7 @@
return molecule return molecule
} }
open override func shouldFinishProcessingLoad(_ loadObject: MVMCoreLoadObject, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject>) -> Bool { open override func shouldFinishProcessingLoad(_ loadObject: MVMCoreLoadObject, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>) -> Bool {
guard super.shouldFinishProcessingLoad(loadObject, error: error) else { return false } guard super.shouldFinishProcessingLoad(loadObject, error: error) else { return false }
// This template requires atleast one of the three layers. // This template requires atleast one of the three layers.

6
MVMCoreUI/BaseControllers/ViewController.swift
View File

@ -23,7 +23,7 @@ import UIKit
} }
/// Set if this page is containted in a manager. /// Set if this page is containted in a manager.
public var manager: (UIViewController & MVMCoreViewManagerProtocol)? public weak var manager: (UIViewController & MVMCoreViewManagerProtocol)?
/// A temporary iVar backer for delegateObject() until we change the protocol /// A temporary iVar backer for delegateObject() until we change the protocol
public lazy var delegateObjectIVar: MVMCoreUIDelegateObject = { public lazy var delegateObjectIVar: MVMCoreUIDelegateObject = {
@ -122,7 +122,7 @@ import UIKit
} }
} }
open func shouldFinishProcessingLoad(_ loadObject: MVMCoreLoadObject, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject>) -> Bool { open func shouldFinishProcessingLoad(_ loadObject: MVMCoreLoadObject, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>) -> Bool {
pageType = loadObject.pageType pageType = loadObject.pageType
self.loadObject = loadObject self.loadObject = loadObject
@ -186,7 +186,7 @@ import UIKit
open func parsePageJSON() throws { } open func parsePageJSON() throws { }
open class func verifyRequiredModulesLoaded(for loadObject: MVMCoreLoadObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject>) -> Bool { open class func verifyRequiredModulesLoaded(for loadObject: MVMCoreLoadObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>) -> Bool {
guard let pageType = loadObject?.pageType, guard let pageType = loadObject?.pageType,
var modulesRequired = MVMCoreUIViewControllerMappingObject.shared()?.modulesRequired(forPageType: pageType), var modulesRequired = MVMCoreUIViewControllerMappingObject.shared()?.modulesRequired(forPageType: pageType),
!modulesRequired.isEmpty !modulesRequired.isEmpty

2
MVMCoreUI/Containers/NavigationController.swift
View File

@ -10,7 +10,7 @@ import UIKit
@objcMembers open class NavigationController: UINavigationController, MVMCoreViewManagerViewControllerProtocol { @objcMembers open class NavigationController: UINavigationController, MVMCoreViewManagerViewControllerProtocol {
public var separatorView: Line? public var separatorView: Line?
public var manager: (UIViewController & MVMCoreViewManagerProtocol)? public weak var manager: (UIViewController & MVMCoreViewManagerProtocol)?
/// Getter for the main navigation controller /// Getter for the main navigation controller
public static func navigationController() -> Self? { public static func navigationController() -> Self? {