Repository: cordova-ios Updated Branches: refs/heads/master d52a6876c -> 582e35776
CB-11705 - Adding CordovaDefaultWebViewEngine configuration option to be able to use a different WebView as default and/or fallback This closes #241 Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/582e3577 Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/582e3577 Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/582e3577 Branch: refs/heads/master Commit: 582e35776f01ee03f32f0986de181bcf5eb4d232 Parents: d52a687 Author: HÃ¥kon Nilsen <[email protected]> Authored: Mon Aug 15 13:30:29 2016 +0200 Committer: Shazron Abdullah <[email protected]> Committed: Fri Aug 19 18:00:34 2016 -0700 ---------------------------------------------------------------------- CordovaLib/Classes/Public/CDVViewController.m | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/582e3577/CordovaLib/Classes/Public/CDVViewController.m ---------------------------------------------------------------------- diff --git a/CordovaLib/Classes/Public/CDVViewController.m b/CordovaLib/Classes/Public/CDVViewController.m index 14b95ea..4019c20 100644 --- a/CordovaLib/Classes/Public/CDVViewController.m +++ b/CordovaLib/Classes/Public/CDVViewController.m @@ -147,13 +147,13 @@ } path = absolutePath; } - + // Assert file exists if (![[NSFileManager defaultManager] fileExistsAtPath:path]) { NSAssert(NO, @"ERROR: %@ does not exist. Please run cordova-ios/bin/cordova_plist_to_config_xml path/to/project.", path); return nil; } - + return path; } @@ -161,7 +161,7 @@ { // read from config.xml in the app bundle NSString* path = [self configFilePath]; - + NSURL* url = [NSURL fileURLWithPath:path]; self.configParser = [[NSXMLParser alloc] initWithContentsOfURL:url]; @@ -272,7 +272,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - + // Load settings [self loadSettings]; @@ -283,7 +283,7 @@ backupWebStorageType = backupWebStorage; } [self.settings setCordovaSetting:backupWebStorageType forKey:@"BackupWebStorage"]; - + [CDVLocalStorage __fixupDatabaseLocationsWithBackupType:backupWebStorageType]; // // Instantiate the WebView /////////////// @@ -446,9 +446,12 @@ - (UIView*)newCordovaViewWithFrame:(CGRect)bounds { - NSString* defaultWebViewEngineClass = @"CDVUIWebViewEngine"; + NSString* defaultWebViewEngineClass = [self.settings cordovaSettingForKey:@"CordovaDefaultWebViewEngine"]; NSString* webViewEngineClass = [self.settings cordovaSettingForKey:@"CordovaWebViewEngine"]; + if (!defaultWebViewEngineClass) { + defaultWebViewEngineClass = @"CDVUIWebViewEngine"; + } if (!webViewEngineClass) { webViewEngineClass = defaultWebViewEngineClass; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
