cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject ios commit: [CB-2848] ShowSplashScreenSpinner not used
Date Tue, 02 Apr 2013 23:36:52 GMT
Updated Branches:
  refs/heads/master 7d6d98597 -> c08e4145c


[CB-2848] ShowSplashScreenSpinner not used


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

Branch: refs/heads/master
Commit: c08e4145c926807e58cfdd845391a8c5d11f8b6d
Parents: 7d6d985
Author: Shazron Abdullah <shazron@apache.org>
Authored: Tue Apr 2 16:36:47 2013 -0700
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Tue Apr 2 16:36:47 2013 -0700

----------------------------------------------------------------------
 CordovaLib/Classes/CDVSplashScreen.m |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c08e4145/CordovaLib/Classes/CDVSplashScreen.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVSplashScreen.m b/CordovaLib/Classes/CDVSplashScreen.m
index efe3eaa..45889a0 100644
--- a/CordovaLib/Classes/CDVSplashScreen.m
+++ b/CordovaLib/Classes/CDVSplashScreen.m
@@ -87,7 +87,12 @@
     // Set the frame & image later.
     _imageView = [[UIImageView alloc] init];
     [parentView addSubview:_imageView];
-    [parentView addSubview:_activityView];
+
+    id showSplashScreenSpinnerValue = [self.commandDelegate.settings objectForKey:@"ShowSplashScreenSpinner"];
+    // backwards compatibility - if key is missing, default to true
+    if ((showSplashScreenSpinnerValue == nil) || [showSplashScreenSpinnerValue boolValue])
{
+        [parentView addSubview:_activityView];
+    }
 
     // Frame is required when launching in portrait mode.
     // Bounds for landscape since it captures the rotation.


Mime
View raw message