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

Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/polling_top_alert

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-10-15 12:18:37 -04:00
commit 1bb0eda96a
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atomic/Molecules/Items/MoleculeStackItemModel.swift
View File

@ -20,6 +20,7 @@ import Foundation
case spacing case spacing
case percent case percent
case gone case gone
case moleculeName
} }
public override init(with moleculeModel: MoleculeModelProtocol) { public override init(with moleculeModel: MoleculeModelProtocol) {
@ -39,6 +40,7 @@ import Foundation
public override func encode(to encoder: Encoder) throws { public 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.encode(moleculeName, forKey: .moleculeName)
try container.encodeIfPresent(spacing, forKey: .spacing) try container.encodeIfPresent(spacing, forKey: .spacing)
try container.encodeIfPresent(percent, forKey: .percent) try container.encodeIfPresent(percent, forKey: .percent)
try container.encode(gone, forKey: .gone) try container.encode(gone, forKey: .gone)

1
MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyLink.swift
View File

@ -34,6 +34,7 @@ import UIKit
headlineBody.topAnchor.constraint(equalTo: topAnchor, constant: 0).isActive = true headlineBody.topAnchor.constraint(equalTo: topAnchor, constant: 0).isActive = true
headlineBody.leftAnchor.constraint(equalTo: leftAnchor).isActive = true headlineBody.leftAnchor.constraint(equalTo: leftAnchor).isActive = true
rightAnchor.constraint(greaterThanOrEqualTo: headlineBody.rightAnchor).isActive = true
var constraint = rightAnchor.constraint(equalTo: headlineBody.rightAnchor) var constraint = rightAnchor.constraint(equalTo: headlineBody.rightAnchor)
constraint.priority = .defaultHigh constraint.priority = .defaultHigh
constraint.isActive = true constraint.isActive = true

8
MVMCoreUI/BaseControllers/ViewController.swift
View File

@ -439,13 +439,17 @@ import UIKit
MVMCoreUISession.sharedGlobal()?.splitViewController?.showRightPanel(animated: true) MVMCoreUISession.sharedGlobal()?.splitViewController?.showRightPanel(animated: true)
} }
} }
/// Override this method to avoid adding form params.
open func addFormParams(_ requestParameters: MVMCoreRequestParameters) {
formValidator?.addFormParams(requestParameters: requestParameters)
}
//-------------------------------------------------- //--------------------------------------------------
// MARK: - MVMCoreActionDelegateProtocol // MARK: - MVMCoreActionDelegateProtocol
//-------------------------------------------------- //--------------------------------------------------
open func handleOpenPage(for requestParameters: MVMCoreRequestParameters, actionInformation: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?) { open func handleOpenPage(for requestParameters: MVMCoreRequestParameters, actionInformation: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?) {
formValidator?.addFormParams(requestParameters: requestParameters) addFormParams(requestParameters)
requestParameters.parentPageType = loadObject?.pageJSON?.optionalStringForKey("parentPageType") requestParameters.parentPageType = loadObject?.pageJSON?.optionalStringForKey("parentPageType")
MVMCoreActionHandler.defaultHandleOpenPage(for: requestParameters, additionalData: additionalData, delegateObject: delegateObject()) MVMCoreActionHandler.defaultHandleOpenPage(for: requestParameters, additionalData: additionalData, delegateObject: delegateObject())
} }