Issue #110 using ifdefs instead

Anis Kadri · Anis Kadri · commit 51e702fb699e · 2016-02-12T14:59:13.000-08:00
diff --git a/src/ios/ContentSync.h b/src/ios/ContentSync.h
@@ -41,9 +41,6 @@ typedef NSUInteger ErrorCodes;
 - (void) cancel:(CDVInvokedUrlCommand*)command;
 - (void) download:(CDVInvokedUrlCommand*)command;
 - (void) unzip:(CDVInvokedUrlCommand*)command;
-#ifndef __CORDOVA_4_0_0
-- (void) loadUrl:(CDVInvokedUrlCommand*)command;
-#endif
 
 @end
 
diff --git a/src/ios/ContentSync.m b/src/ios/ContentSync.m
@@ -528,13 +528,15 @@ - (BOOL) copyCordovaAssets:(NSString*)unzippedPath copyRootApp:(BOOL)copyRootApp
     return YES;
 }
 
+#ifdef __CORDOVA_4_0_0
 - (void)loadUrl:(CDVInvokedUrlCommand*) command {
     NSString* url = [command argumentAtIndex:0 withDefault:nil];
     if(url != nil) {
         NSURLRequest* request = [NSURLRequest requestWithURL:[NSURL URLWithString:url]];
         [self.webViewEngine loadRequest:request];
     }
 }
+#endif
 
 - (NSURLSession*) backgroundSession:(NSNumber*)timeout {
     static NSURLSession *session = nil;

Original file line number	Diff line number	Diff line change
`@@ -528,13 +528,15 @@ - (BOOL) copyCordovaAssets:(NSString*)unzippedPath copyRootApp:(BOOL)copyRootApp`
`528`	`528`	`return YES;`
`529`	`529`	`}`
`530`	`530`
	`531`	`+#ifdef __CORDOVA_4_0_0`
`531`	`532`	`- (void)loadUrl:(CDVInvokedUrlCommand*) command {`
`532`	`533`	`NSString* url = [command argumentAtIndex:0 withDefault:nil];`
`533`	`534`	`if(url != nil) {`
`534`	`535`	`NSURLRequest* request = [NSURLRequest requestWithURL:[NSURL URLWithString:url]];`
`535`	`536`	`[self.webViewEngine loadRequest:request];`
`536`	`537`	`}`
`537`	`538`	`}`
	`539`	`+#endif`
`538`	`540`
`539`	`541`	`- (NSURLSession) backgroundSession:(NSNumber)timeout {`
`540`	`542`	`static NSURLSession *session = nil;`