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 2015/12/16 02:07:10 UTC
[1/6] ios commit: CB-10168: CDVViewController appURL is nil if
wwwFolderName is the path to a resource bundle
Repository: cordova-ios
Updated Branches:
refs/heads/4.0.x b3cfbeea8 -> e40a776fa
CB-10168: CDVViewController appURL is nil if wwwFolderName is the path to a resource bundle
This closes #184
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/c586fc22
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/c586fc22
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/c586fc22
Branch: refs/heads/4.0.x
Commit: c586fc228f49fda6d19f888b183f93fcd6f3a4df
Parents: b3cfbee
Author: Mirko Luchi <mi...@finantix.com>
Authored: Wed Dec 9 17:20:19 2015 +0100
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Dec 15 16:59:33 2015 -0800
----------------------------------------------------------------------
CordovaLib/Classes/Public/CDVViewController.m | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c586fc22/CordovaLib/Classes/Public/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/Public/CDVViewController.m b/CordovaLib/Classes/Public/CDVViewController.m
index e24eef6..b66f524 100644
--- a/CordovaLib/Classes/Public/CDVViewController.m
+++ b/CordovaLib/Classes/Public/CDVViewController.m
@@ -191,6 +191,10 @@
appURL = [NSURL URLWithString:self.startPage];
} else if ([self.wwwFolderName rangeOfString:@"://"].location != NSNotFound) {
appURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@", self.wwwFolderName, self.startPage]];
+ } else if([self.wwwFolderName hasSuffix:@".bundle"]){
+ // www folder is actually a bundle
+ 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
[4/6] ios commit: CB-10185 - Update CordovaLib.xcodeproj to
recommended settings in Xcode 7.2
Posted by sh...@apache.org.
CB-10185 - Update CordovaLib.xcodeproj to recommended settings in Xcode 7.2
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/c1448ff9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/c1448ff9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/c1448ff9
Branch: refs/heads/4.0.x
Commit: c1448ff9ac24f8155c336c081d6759e9f7ba83d7
Parents: 444851b
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue Dec 15 00:06:33 2015 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Dec 15 16:59:59 2015 -0800
----------------------------------------------------------------------
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c1448ff9/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index 394bc4e..b258171 100644
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@ -339,7 +339,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0510;
+ LastUpgradeCheck = 0720;
};
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "CordovaLib" */;
compatibilityVersion = "Xcode 3.2";
@@ -450,6 +450,7 @@
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = "";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/6] ios commit: CB-10155 - DisallowOverscroll not working
Posted by sh...@apache.org.
CB-10155 - DisallowOverscroll not working
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/8a187bff
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/8a187bff
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/8a187bff
Branch: refs/heads/4.0.x
Commit: 8a187bff65c55e6c0daf67b61c371f03234c2af5
Parents: c586fc2
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Dec 14 15:32:15 2015 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Dec 15 16:59:42 2015 -0800
----------------------------------------------------------------------
.../Private/Plugins/CDVUIWebViewEngine/CDVUIWebViewEngine.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/8a187bff/CordovaLib/Classes/Private/Plugins/CDVUIWebViewEngine/CDVUIWebViewEngine.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/Private/Plugins/CDVUIWebViewEngine/CDVUIWebViewEngine.m b/CordovaLib/Classes/Private/Plugins/CDVUIWebViewEngine/CDVUIWebViewEngine.m
index ef0356c..c283e18 100644
--- a/CordovaLib/Classes/Private/Plugins/CDVUIWebViewEngine/CDVUIWebViewEngine.m
+++ b/CordovaLib/Classes/Private/Plugins/CDVUIWebViewEngine/CDVUIWebViewEngine.m
@@ -116,7 +116,7 @@
// prevent webView from bouncing
if (!bounceAllowed) {
- if ([self.webView respondsToSelector:@selector(scrollView)]) {
+ if ([uiWebView respondsToSelector:@selector(scrollView)]) {
((UIScrollView*)[uiWebView scrollView]).bounces = NO;
} else {
for (id subview in self.webView.subviews) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/6] ios commit: CB-10171 - WebKit Error after migration to iOS@4.0.0
Posted by sh...@apache.org.
CB-10171 - WebKit Error after migration to iOS@4.0.0
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/444851b9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/444851b9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/444851b9
Branch: refs/heads/4.0.x
Commit: 444851b9c76139e61ae00053d4f9b970569e4b4d
Parents: 8a187bf
Author: Shazron Abdullah <sh...@apache.org>
Authored: Mon Dec 14 16:09:45 2015 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Dec 15 16:59:51 2015 -0800
----------------------------------------------------------------------
CordovaLib/Classes/Public/CDVWhitelist.m | 2 +-
tests/CordovaLibTests/CDVWhitelistTests.m | 25 ++++++++++++++++++-------
2 files changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/444851b9/CordovaLib/Classes/Public/CDVWhitelist.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/Public/CDVWhitelist.m b/CordovaLib/Classes/Public/CDVWhitelist.m
index af0a564..552ea95 100644
--- a/CordovaLib/Classes/Public/CDVWhitelist.m
+++ b/CordovaLib/Classes/Public/CDVWhitelist.m
@@ -88,7 +88,7 @@ NSString* const kCDVDefaultSchemeName = @"cdv-default-scheme";
- (bool)matches:(NSURL*)url
{
return (_scheme == nil || [_scheme numberOfMatchesInString:[url scheme] options:NSMatchingAnchored range:NSMakeRange(0, [[url scheme] length])]) &&
- (_host == nil || [_host numberOfMatchesInString:[url host] options:NSMatchingAnchored range:NSMakeRange(0, [[url host] length])]) &&
+ (_host == nil || ([url host] != nil && [_host numberOfMatchesInString:[url host] options:NSMatchingAnchored range:NSMakeRange(0, [[url host] length])])) &&
(_port == nil || [[url port] isEqualToNumber:_port]) &&
(_path == nil || [_path numberOfMatchesInString:[url path] options:NSMatchingAnchored range:NSMakeRange(0, [[url path] length])])
;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/444851b9/tests/CordovaLibTests/CDVWhitelistTests.m
----------------------------------------------------------------------
diff --git a/tests/CordovaLibTests/CDVWhitelistTests.m b/tests/CordovaLibTests/CDVWhitelistTests.m
index 846658d..5f979c0 100644
--- a/tests/CordovaLibTests/CDVWhitelistTests.m
+++ b/tests/CordovaLibTests/CDVWhitelistTests.m
@@ -241,19 +241,30 @@
XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://cordova.apache.org"]]);
}
-- (void)testWildcardPlusScheme
+- (void)testWildcardScheme
{
NSArray* allowedHosts = [NSArray arrayWithObjects:
- @"http://*.apache.org",
+ @"*://*.test.com",
nil];
CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
- XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.apache.org"]]);
- XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"https://www.google.com"]]);
- XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"ftp://cordova.apache.org"]]);
- XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://cordova.apache.org"]]);
- XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"https://cordova.apache.org"]]);
+ XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]]);
+ XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"gopher://testtt.com"]]);
+
+ XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"gopher://test.com"]]);
+ XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://test.com"]]);
+ XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://my.test.com"]]);
+ XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://test.com"]]);
+ XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://my.test.com"]]);
+
+ XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://test.com/my/path"]]);
+ XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://my.test.com/my/path"]]);
+ XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://test.com/my/path"]]);
+ XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://my.test.com/my/path"]]);
+
+ XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"gopher://test.com#foo"]]);
+ XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"#foo"]]);
}
- (void)testCredentials
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[6/6] ios commit: CB-10203 Updated RELEASENOTES and Version for
release 4.0.1
Posted by sh...@apache.org.
CB-10203 Updated RELEASENOTES and Version for release 4.0.1
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/e40a776f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/e40a776f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/e40a776f
Branch: refs/heads/4.0.x
Commit: e40a776faad69b1282f912625d90b927ec063f3c
Parents: 0f8c8e9
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue Dec 15 16:56:36 2015 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Dec 15 17:04:35 2015 -0800
----------------------------------------------------------------------
RELEASENOTES.md | 9 +++++++++
package.json | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e40a776f/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 79529e7..3dfc5be 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -24,6 +24,15 @@ Update these notes using: git log --pretty=format:'* %s' --topo-order --no-merge
Cordova is a static library that enables developers to include the Cordova API in their iOS application projects easily, and also create new Cordova-based iOS application projects through the command-line.
+### 4.0.1 (Dec 15, 2015)
+
+* CB-10185 - Update CordovaLib.xcodeproj to recommended settings in Xcode 7.2
+* CB-10171 - WebKit Error after migration to iOS@4.0.0
+* CB-10155 - DisallowOverscroll not working
+* CB-10168 - CDVViewController appURL is nil if wwwFolderName is the path to a resource bundle
+* CB-10162 - update reference url for icon images
+* CB-10162 - correct the paths for iOS icon and splashscreen resources
+
### 4.0.0 (Dec 04, 2015)
* CB-10136 - error in cordova prepare (Platform API)
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e40a776f/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index a7d520c..eb54634 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-ios",
- "version": "4.0.0",
+ "version": "4.0.1",
"description": "cordova-ios release",
"main": "bin/templates/scripts/cordova/Api.js",
"repository": {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[5/6] ios commit: Updated CDV version macro to 4.0.1
Posted by sh...@apache.org.
Updated CDV version macro to 4.0.1
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/0f8c8e9a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/0f8c8e9a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/0f8c8e9a
Branch: refs/heads/4.0.x
Commit: 0f8c8e9ad73491674ffa4be882951ce231be38e4
Parents: c1448ff
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue Dec 15 16:48:21 2015 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Dec 15 17:00:11 2015 -0800
----------------------------------------------------------------------
CordovaLib/Classes/Public/CDVAvailability.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/0f8c8e9a/CordovaLib/Classes/Public/CDVAvailability.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/Public/CDVAvailability.h b/CordovaLib/Classes/Public/CDVAvailability.h
index 2b8c536..ef7c9ce 100644
--- a/CordovaLib/Classes/Public/CDVAvailability.h
+++ b/CordovaLib/Classes/Public/CDVAvailability.h
@@ -59,6 +59,7 @@
#define __CORDOVA_3_9_1 30901
#define __CORDOVA_3_9_2 30902
#define __CORDOVA_4_0_0 40000
+#define __CORDOVA_4_0_1 40001
/* coho:next-version,insert-before */
#define __CORDOVA_NA 99999 /* not available */
@@ -71,7 +72,7 @@
*/
#ifndef CORDOVA_VERSION_MIN_REQUIRED
/* coho:next-version-min-required,replace-after */
- #define CORDOVA_VERSION_MIN_REQUIRED __CORDOVA_4_0_0
+ #define CORDOVA_VERSION_MIN_REQUIRED __CORDOVA_4_0_1
#endif
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org