incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject [3/4] ios commit: Do not hardcode launch image filename on phone
Date Fri, 29 Jun 2012 17:55:37 GMT
Do not hardcode launch image filename on phone

Signed-off-by: Shazron Abdullah <shazron@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/53fe8523
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/53fe8523
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/53fe8523

Branch: refs/heads/master
Commit: 53fe8523b9ed89fe1808d15330f65b7db087682c
Parents: 5412e6a
Author: Sijmen Mulder <sjmulder@gmail.com>
Authored: Tue Jun 5 15:07:39 2012 +0200
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Fri Jun 29 10:24:49 2012 -0700

----------------------------------------------------------------------
 CordovaLib/Classes/CDVViewController.m |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/53fe8523/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.m b/CordovaLib/Classes/CDVViewController.m
index 3a307e9..848e692 100644
--- a/CordovaLib/Classes/CDVViewController.m
+++ b/CordovaLib/Classes/CDVViewController.m
@@ -700,15 +700,13 @@
             }
                 break;
         }
-        
-        launchImage = [UIImage imageNamed:[[self class] resolveImageResource:orientedLaunchImageFile]];
     }
     else // not iPad
     {
-        orientedLaunchImageFile = @"Default";
-        launchImage = [UIImage imageNamed:[[self class] resolveImageResource:orientedLaunchImageFile]];
+        orientedLaunchImageFile = launchImageFile;
     }
     
+    launchImage = [UIImage imageNamed:[[self class] resolveImageResource:orientedLaunchImageFile]];
     if (launchImage == nil) {
         NSLog(@"WARNING: Splash-screen image '%@' was not found. Orientation: %d, iPad: %d",
orientedLaunchImageFile, deviceOrientation, isIPad);
     }


Mime
View raw message