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

fixes

Browse Source
This commit is contained in:
Suresh, Kamlesh 2020-02-17 22:28:09 -05:00
parent a2700e81b4
commit e2860efaf6
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/BaseControllers/MFViewController.h
View File

@ -277,7 +277,7 @@
// subclass to set up intro animations // subclass to set up intro animations
- (void)setupIntroAnimations; - (void)setupIntroAnimations;
- (void)parsePageJSONAndReturnError:(NSError * _Nullable * _Nullable)error; - (void)parsePageJSON:(NSError * _Nullable * _Nullable)error;
@end @end

6
MVMCoreUI/BaseControllers/MFViewController.m
View File

@ -98,7 +98,7 @@
self.loadObject = loadObject; self.loadObject = loadObject;
NSError *parseError = nil; NSError *parseError = nil;
[self parsePageJSONAndReturnError:&parseError]; [self parsePageJSON:&parseError];
if (parseError) { if (parseError) {
if (error) { if (error) {
MVMCoreErrorObject *errorObject = [MVMCoreErrorObject createErrorObjectForNSError:parseError location:[[MVMCoreLoadHandler sharedGlobal] errorLocationForRequest:loadObject]]; MVMCoreErrorObject *errorObject = [MVMCoreErrorObject createErrorObjectForNSError:parseError location:[[MVMCoreLoadHandler sharedGlobal] errorLocationForRequest:loadObject]];
@ -112,7 +112,7 @@
return [MFViewController verifyRequiredModulesLoadedForLoadObject:loadObject error:error]; return [MFViewController verifyRequiredModulesLoadedForLoadObject:loadObject error:error];
} }
- (void)parsePageJSONAndReturnError:(NSError * _Nullable * _Nullable)error { - (void)parsePageJSON:(NSError * _Nullable * _Nullable)error {
} }
@ -265,7 +265,7 @@
- (BOOL)newPageLoaded:(nonnull NSDictionary *)page { - (BOOL)newPageLoaded:(nonnull NSDictionary *)page {
self.loadObject.pageJSON = page; self.loadObject.pageJSON = page;
NSError *parseError = nil; NSError *parseError = nil;
[self parsePageJSONAndReturnError:&parseError]; [self parsePageJSON:&parseError];
return YES; return YES;
} }

2
MVMCoreUI/Templates/MoleculeListTemplate.swift
View File

@ -23,7 +23,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
// MARK: - Computed Properties // MARK: - Computed Properties
//-------------------------------------------------- //--------------------------------------------------
open override func parsePageJSONAndReturnError(_ error: NSErrorPointer) { open override func parsePageJSON(_ error: NSErrorPointer) {
try? parseTemplateJSON() try? parseTemplateJSON()
} }

2
MVMCoreUI/Templates/MoleculeStackTemplate.swift
View File

@ -12,7 +12,7 @@ open class MoleculeStackTemplate: ThreeLayerViewController, TemplateProtocol {
var observer: NSKeyValueObservation? var observer: NSKeyValueObservation?
public var templateModel: StackPageTemplateModel? public var templateModel: StackPageTemplateModel?
open override func parsePageJSONAndReturnError(_ error: NSErrorPointer) { open override func parsePageJSON(_ error: NSErrorPointer) {
try? parseTemplateJSON() try? parseTemplateJSON()
} }

2
MVMCoreUI/Templates/ThreeLayerTemplate.swift
View File

@ -12,7 +12,7 @@ import UIKit
public var templateModel: ThreeLayerPageTemplateModel? public var templateModel: ThreeLayerPageTemplateModel?
open override func parsePageJSONAndReturnError(_ error: NSErrorPointer) { open override func parsePageJSON(_ error: NSErrorPointer) {
try? parseTemplateJSON() try? parseTemplateJSON()
} }