You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mm...@apache.org on 2012/12/01 18:22:07 UTC
ios commit: [ios] Add support for https:// start pages (instead of
just http)
Updated Branches:
refs/heads/master 7f6d64375 -> 9229bac7b
[ios] Add support for https:// start pages (instead of just http)
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/9229bac7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/9229bac7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/9229bac7
Branch: refs/heads/master
Commit: 9229bac7b4efdb8105955fcec1c2925d2f357794
Parents: 7f6d643
Author: Michal Mocny <mm...@gmail.com>
Authored: Sat Dec 1 12:21:42 2012 -0500
Committer: Michal Mocny <mm...@gmail.com>
Committed: Sat Dec 1 12:21:42 2012 -0500
----------------------------------------------------------------------
CordovaLib/Classes/CDVViewController.m | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/9229bac7/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.m b/CordovaLib/Classes/CDVViewController.m
index 1199984..4930104 100644
--- a/CordovaLib/Classes/CDVViewController.m
+++ b/CordovaLib/Classes/CDVViewController.m
@@ -173,9 +173,9 @@ static NSString* gOriginalUserAgent = nil;
NSURL* appURL = nil;
NSString* loadErr = nil;
- if ([self.startPage hasPrefix:@"http://"]) {
+ if ([self.startPage hasPrefix:@"http://"] || [self.startPage hasPrefix:@"https://"]) {
appURL = [NSURL URLWithString:self.startPage];
- } else if ([self.wwwFolderName hasPrefix:@"http://"]) {
+ } else if ([self.wwwFolderName hasPrefix:@"http://"] || [self.wwwFolderName hasPrefix:@"https://"]) {
appURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@", self.wwwFolderName, self.startPage]];
} else {
NSString* startFilePath = [_commandDelegate pathForResource:self.startPage];