Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 84124F082 for ; Tue, 2 Apr 2013 23:36:52 +0000 (UTC) Received: (qmail 13220 invoked by uid 500); 2 Apr 2013 23:36:52 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 13200 invoked by uid 500); 2 Apr 2013 23:36:52 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 13193 invoked by uid 99); 2 Apr 2013 23:36:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Apr 2013 23:36:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 092458365D1; Tue, 2 Apr 2013 23:36:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shazron@apache.org To: commits@cordova.apache.org Message-Id: <57410f0f6833409bb51be9c20573529a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ios commit: [CB-2848] ShowSplashScreenSpinner not used Date: Tue, 2 Apr 2013 23:36:52 +0000 (UTC) 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 Authored: Tue Apr 2 16:36:47 2013 -0700 Committer: Shazron Abdullah 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.