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 2013/07/11 02:04:54 UTC
ios commit: [CB-4145] Remove CDVViewController.useSplashScreen
property
Updated Branches:
refs/heads/master 568c7bf7a -> c24b6e3ac
[CB-4145] Remove CDVViewController.useSplashScreen property
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/c24b6e3a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/c24b6e3a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/c24b6e3a
Branch: refs/heads/master
Commit: c24b6e3ac8f4240f75921142fd9d4f6b6d1a50d7
Parents: 568c7bf
Author: Shazron Abdullah <sh...@apache.org>
Authored: Wed Jul 10 17:04:18 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Wed Jul 10 17:04:18 2013 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVViewController.h | 1 -
CordovaLib/Classes/CDVViewController.m | 7 -------
bin/templates/project/__TESTING__/Classes/AppDelegate.m | 1 -
3 files changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c24b6e3a/CordovaLib/Classes/CDVViewController.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.h b/CordovaLib/Classes/CDVViewController.h
index 2338baf..1015c50 100644
--- a/CordovaLib/Classes/CDVViewController.h
+++ b/CordovaLib/Classes/CDVViewController.h
@@ -43,7 +43,6 @@
@property (nonatomic, readonly, strong) NSXMLParser* configParser;
@property (nonatomic, readonly, strong) CDVWhitelist* whitelist; // readonly for public
@property (nonatomic, readonly, assign) BOOL loadFromString;
-@property (nonatomic, readwrite, assign) BOOL useSplashScreen CDV_DEPRECATED(2.5, "Add/Remove the SplashScreen plugin instead of setting this property.");
@property (nonatomic, readwrite, copy) NSString* wwwFolderName;
@property (nonatomic, readwrite, copy) NSString* startPage;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c24b6e3a/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.m b/CordovaLib/Classes/CDVViewController.m
index 5ee5120..6162dc9 100644
--- a/CordovaLib/Classes/CDVViewController.m
+++ b/CordovaLib/Classes/CDVViewController.m
@@ -52,7 +52,6 @@
@synthesize webView, supportedOrientations;
@synthesize pluginObjects, pluginsMap, whitelist, startupPluginNames;
@synthesize configParser, settings, loadFromString;
-@synthesize useSplashScreen;
@synthesize wwwFolderName, startPage, initialized, openURL;
@synthesize commandDelegate = _commandDelegate;
@synthesize commandQueue = _commandQueue;
@@ -85,7 +84,6 @@
// load config.xml settings
[self loadSettings];
- useSplashScreen = YES;
}
}
@@ -375,11 +373,6 @@
[CDVTimer stop:@"TotalPluginStartup"];
}
- // TODO: Remove this explicit instantiation once we move to cordova-CLI.
- if (useSplashScreen) {
- [self getCommandInstance:@"splashscreen"];
- }
-
// /////////////////
[CDVUserAgentUtil acquireLock:^(NSInteger lockToken) {
_userAgentLockToken = lockToken;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c24b6e3a/bin/templates/project/__TESTING__/Classes/AppDelegate.m
----------------------------------------------------------------------
diff --git a/bin/templates/project/__TESTING__/Classes/AppDelegate.m b/bin/templates/project/__TESTING__/Classes/AppDelegate.m
index 5c05ac8..b7dfd93 100644
--- a/bin/templates/project/__TESTING__/Classes/AppDelegate.m
+++ b/bin/templates/project/__TESTING__/Classes/AppDelegate.m
@@ -77,7 +77,6 @@
#else
self.viewController = [[[MainViewController alloc] init] autorelease];
#endif
- self.viewController.useSplashScreen = YES;
// Set your app's start page by setting the <content src='foo.html' /> tag in config.xml.
// If necessary, uncomment the line below to override it.