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 2014/10/01 22:59:24 UTC
git commit: CB-7633 - (Re-fix based on updated unit tests) iPhone 6
Plus support
Repository: cordova-plugin-splashscreen
Updated Branches:
refs/heads/master 21f372acc -> 24e6f2e0d
CB-7633 - (Re-fix based on updated unit tests) iPhone 6 Plus support
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/commit/24e6f2e0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/24e6f2e0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/24e6f2e0
Branch: refs/heads/master
Commit: 24e6f2e0dd3f54781bd9b9f16d49585ace53d10a
Parents: 21f372a
Author: Shazron Abdullah <sh...@gmail.com>
Authored: Wed Oct 1 13:59:22 2014 -0700
Committer: Shazron Abdullah <sh...@gmail.com>
Committed: Wed Oct 1 13:59:22 2014 -0700
----------------------------------------------------------------------
src/ios/CDVSplashScreen.m | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/24e6f2e0/src/ios/CDVSplashScreen.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVSplashScreen.m b/src/ios/CDVSplashScreen.m
index 91fb251..ade5df0 100644
--- a/src/ios/CDVSplashScreen.m
+++ b/src/ios/CDVSplashScreen.m
@@ -162,15 +162,17 @@
} else if (device.iPhone6) { // does not support landscape
imageName = [imageName stringByAppendingString:@"-667h"];
} else if (device.iPhone6Plus) { // supports landscape
- switch (currentOrientation) {
- case UIInterfaceOrientationLandscapeLeft:
- case UIInterfaceOrientationLandscapeRight:
- if (supportsLandscape) {
- imageName = [imageName stringByAppendingString:@"-Landscape"];
- }
- break;
- default:
- break;
+ if (isOrientationLocked) {
+ imageName = [imageName stringByAppendingString:(supportsLandscape ? @"-Landscape" : @"")];
+ } else {
+ switch (currentOrientation) {
+ case UIInterfaceOrientationLandscapeLeft:
+ case UIInterfaceOrientationLandscapeRight:
+ imageName = [imageName stringByAppendingString:@"-Landscape"];
+ break;
+ default:
+ break;
+ }
}
imageName = [imageName stringByAppendingString:@"-736h"];