You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2016/05/09 22:30:32 UTC
ios commit: CB-11069 - CDVViewController appURL is nil if
wwwFolderName is the path to a framework
Repository: cordova-ios
Updated Branches:
refs/heads/master a804ef2ea -> fe0473b38
CB-11069 - CDVViewController appURL is nil if wwwFolderName is the path to a framework
Fix -[CDVViewController appUrl] method to take into account a
wwwFolderName which is a framework
Signed-off-by: Shazron Abdullah <sh...@apache.org>
This closes #217
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/fe0473b3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/fe0473b3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/fe0473b3
Branch: refs/heads/master
Commit: fe0473b3865390cc491429cb98fe7ce9acfa3c31
Parents: a804ef2
Author: Mirko Luchi <mi...@thedigitalstack.com>
Authored: Tue Apr 12 16:15:36 2016 +0200
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon May 9 15:30:42 2016 -0700
----------------------------------------------------------------------
CordovaLib/Classes/Public/CDVViewController.m | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/fe0473b3/CordovaLib/Classes/Public/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/Public/CDVViewController.m b/CordovaLib/Classes/Public/CDVViewController.m
index 000d184..d7acea7 100644
--- a/CordovaLib/Classes/Public/CDVViewController.m
+++ b/CordovaLib/Classes/Public/CDVViewController.m
@@ -212,6 +212,10 @@
// www folder is actually a bundle
NSBundle* bundle = [NSBundle bundleWithPath:self.wwwFolderName];
appURL = [bundle URLForResource:self.startPage withExtension:nil];
+ } else if([self.wwwFolderName hasSuffix:@".framework"]){
+ // www folder is actually a framework
+ NSBundle* bundle = [NSBundle bundleWithPath:self.wwwFolderName];
+ appURL = [bundle URLForResource:self.startPage withExtension:nil];
} else {
// CB-3005 strip parameters from start page to check if page exists in resources
NSURL* startURL = [NSURL URLWithString:self.startPage];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org