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

Merge branch 'feature/successive_var_name_change' into 'develop'

Browse Source 
change successivePageTypes to sequentialPageTypes

See merge request BPHV_MIPS/mvm_core!112
This commit is contained in:
Hedden, Kyle Matthew 2020-10-05 17:09:51 -04:00
commit db6ba46810
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m
View File

@ -72,7 +72,7 @@
if (operation.dependenciesAdded) return; // Prevents dependencies from being added twice.
operation.dependenciesAdded = YES;
NSString *addingPageType = operation.requestParameters.pageType;
NSArray<NSString *>* successivePageTypes = operation.requestParameters.successivePageTypes;
NSArray<NSString *>* sequentialPageTypes = operation.requestParameters.sequentialPageTypes;
// For each registered queue...
for (NSOperationQueue *queue in self.registeredLoadQueues) {
// Iterate thru each existing operation...
@ -82,8 +82,8 @@
MVMCoreRequestParameters *existingOpParams = ((MVMCoreLoadRequestOperation *)existingOperation).requestParameters;
// If existing operation page type is one of the new operation registered conflicting page types,
// or the new operation page type is one of the existing operation's conflicting page types...
if ([successivePageTypes containsObject:existingOpParams.pageType] ||
[existingOpParams.successivePageTypes containsObject:addingPageType]) {
if ([sequentialPageTypes containsObject:existingOpParams.pageType] ||
[existingOpParams.sequentialPageTypes containsObject:addingPageType]) {
// Add a dependency on the new page type of the existing page type. Note dependencies are only added to new operations, so the method would never push an operation ahead of an exisitng operation, avoiding causing circular dependencies.
MVMCoreLog(@"Adding %@ call dependency on %@", existingOpParams.pageType, operation.requestParameters.pageType);
[operation addDependency:existingOperation];

2
MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.h
View File

@ -91,7 +91,7 @@ typedef NS_ENUM(NSInteger, MFLoadStyle) {
@property (nonatomic) BOOL openSupportPanel;
// A list of page types that this operation should NOT be loaded in parallel with.
@property (nullable, strong, nonatomic) NSArray<NSString *> * successivePageTypes;
@property (nullable, strong, nonatomic) NSArray<NSString *> * sequentialPageTypes;
/// A flag for if it should be a background request or not.
@property (assign, nonatomic) BOOL backgroundRequest;