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

Merge branch 'release/8_0_0' into 'develop'

Browse Source 
release/8_0_0 hotfix merge

See merge request BPHV_MIPS/mvm_core!99
This commit is contained in:
Hedden, Kyle Matthew 2020-08-31 17:30:25 -04:00
commit 34c60c4f19
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.m
View File

@ -69,6 +69,7 @@
self.actionMap = actionMap;
self.customTimeoutTime = [actionMap optionalNumberForKey:@"customTimeoutTime"];
self.openSupportPanel = [actionMap boolForKey:KeyOpenSupport];
self.backgroundRequest = [actionMap boolForKey:@"background"];
// Right now server is sending default.... can't uncomment this until they remove default
//self.replaceViewIfOnStackElseLoadWithStyle = [actionMap boolForKey:@"tryToReplaceFirst"];

6
MVMCore/MVMCore/Models/ActionType/ActionOpenPageModel.swift
View File

@ -19,16 +19,18 @@
public var analyticsData: JSONValueDictionary?
public var presentationStyle: String?
public var tabBarIndex: Int?
public var background: Bool?
//--------------------------------------------------
// MARK: - Initialzier
//--------------------------------------------------
public init(pageType: String, presentationStyle: String? = nil, extraParameters: JSONValueDictionary? = nil, analyticsData: JSONValueDictionary? = nil, tabBarIndex: Int? = nil) {
public init(pageType: String, presentationStyle: String? = nil, extraParameters: JSONValueDictionary? = nil, analyticsData: JSONValueDictionary? = nil, tabBarIndex: Int? = nil, background: Bool? = nil) {
self.pageType = pageType
self.presentationStyle = presentationStyle
self.extraParameters = extraParameters
self.analyticsData = analyticsData
self.tabBarIndex = tabBarIndex
self.background = background
}
}