cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmo...@apache.org
Subject [29/50] ios commit: Merge branch 'next'
Date Mon, 25 Feb 2013 13:41:01 GMT
Merge branch 'next'


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

Branch: refs/heads/multipart_plugin_result
Commit: f55d0d95812252f60150b1033d59385cf44464c1
Parents: 709d607 0005897
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Wed Feb 20 14:29:42 2013 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Wed Feb 20 14:29:42 2013 -0500

----------------------------------------------------------------------
 CordovaLib/Classes/CDVSplashScreen.m   |   12 +-----------
 CordovaLib/Classes/CDVViewController.h |    3 +--
 CordovaLib/Classes/CDVViewController.m |   19 +++++--------------
 3 files changed, 7 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/f55d0d95/CordovaLib/Classes/CDVSplashScreen.m
----------------------------------------------------------------------
diff --cc CordovaLib/Classes/CDVSplashScreen.m
index 949444e,cba1b53..108743c
--- a/CordovaLib/Classes/CDVSplashScreen.m
+++ b/CordovaLib/Classes/CDVSplashScreen.m
@@@ -28,12 -28,10 +28,10 @@@
  
  - (void)pluginInitialize
  {
 -    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(pageDidLoad)
name:CDVPageDidLoadNotification object:nil];
 +    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(pageDidLoad)
name:CDVPageDidLoadNotification object:self.webView];
      [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onOrientationWillChange:)
name:UIApplicationWillChangeStatusBarOrientationNotification object:nil];
  
-     if (self.useSplashScreen) {
-         [self show:nil];
-     }
+     [self show:nil];
  }
  
  - (void)show:(CDVInvokedUrlCommand*)command

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/f55d0d95/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------


Mime
View raw message