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 2015/05/20 01:21:20 UTC
[9/9] ios commit: Fixed merge build failures due to API removal (plus
uncrustify style fixes)
Fixed merge build failures due to API removal (plus uncrustify style fixes)
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/957052bb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/957052bb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/957052bb
Branch: refs/heads/4.0.x
Commit: 957052bbfd03a8d5d4a66c79739b81d0c14859a2
Parents: d0877d0
Author: Shazron Abdullah <sh...@apache.org>
Authored: Tue May 19 16:22:08 2015 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue May 19 16:22:08 2015 -0700
----------------------------------------------------------------------
CordovaLib/Classes/Public/CDVViewController.m | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/957052bb/CordovaLib/Classes/Public/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/Public/CDVViewController.m b/CordovaLib/Classes/Public/CDVViewController.m
index 39c10c7..a4a91e4 100644
--- a/CordovaLib/Classes/Public/CDVViewController.m
+++ b/CordovaLib/Classes/Public/CDVViewController.m
@@ -417,12 +417,12 @@
NSString* localBaseUserAgent;
if (self.baseUserAgent != nil) {
localBaseUserAgent = self.baseUserAgent;
- } else if ([self settingForKey:@"OverrideUserAgent"] != nil) {
- localBaseUserAgent = [self settingForKey:@"OverrideUserAgent"];
+ } else if ([self.settings cordovaSettingForKey:@"OverrideUserAgent"] != nil) {
+ localBaseUserAgent = [self.settings cordovaSettingForKey:@"OverrideUserAgent"];
} else {
localBaseUserAgent = [CDVUserAgentUtil originalUserAgent];
}
- NSString* appendUserAgent = [self settingForKey:@"AppendUserAgent"];
+ NSString* appendUserAgent = [self.settings cordovaSettingForKey:@"AppendUserAgent"];
if (appendUserAgent) {
_userAgent = [NSString stringWithFormat:@"%@ %@", localBaseUserAgent, appendUserAgent];
} else {
@@ -714,13 +714,13 @@
{
// NSLog(@"%@",@"applicationWillEnterForeground");
[self.commandDelegate evalJs:@"cordova.fireDocumentEvent('resume');"];
-
+
/** Clipboard fix **/
- UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
- NSString *string = pasteboard.string;
+ UIPasteboard* pasteboard = [UIPasteboard generalPasteboard];
+ NSString* string = pasteboard.string;
if (string) {
[pasteboard setValue:string forPasteboardType:@"public.text"];
- }
+ }
}
// This method is called to let your application know that it moved from the inactive to active state.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org