From d0deb2559a513dd33d17ca2d664608d3e6d97ccd Mon Sep 17 00:00:00 2001 From: Kyle Matthew Hedden Date: Thu, 1 Oct 2020 17:15:01 -0400 Subject: [PATCH] change successivePageTypes to sequentialPageTypes --- MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m | 6 +++--- MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m index 6227188..d9d3171 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m @@ -72,7 +72,7 @@ if (operation.dependenciesAdded) return; // Prevents dependencies from being added twice. operation.dependenciesAdded = YES; NSString *addingPageType = operation.requestParameters.pageType; - NSArray* successivePageTypes = operation.requestParameters.successivePageTypes; + NSArray* 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]; diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.h b/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.h index 80702a4..15163a0 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.h +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.h @@ -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 * successivePageTypes; +@property (nullable, strong, nonatomic) NSArray * sequentialPageTypes; /// A flag for if it should be a background request or not. @property (assign, nonatomic) BOOL backgroundRequest;