cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [1/3] ios commit: Fix InAppBrowser on iOS 5.
Date Thu, 24 Jan 2013 18:41:51 GMT
Fix InAppBrowser on iOS 5.

We were calling an iOS 6-only method during initialization.


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

Branch: refs/heads/master
Commit: 70dad320987430795881764db7b22cc10ac2134e
Parents: 41955f9
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Thu Jan 24 13:36:45 2013 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Thu Jan 24 13:37:44 2013 -0500

----------------------------------------------------------------------
 CordovaLib/Classes/CDVInAppBrowser.m |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/70dad320/CordovaLib/Classes/CDVInAppBrowser.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVInAppBrowser.m b/CordovaLib/Classes/CDVInAppBrowser.m
index 6d7b770..5be3769 100644
--- a/CordovaLib/Classes/CDVInAppBrowser.m
+++ b/CordovaLib/Classes/CDVInAppBrowser.m
@@ -130,8 +130,10 @@
     self.inAppBrowserViewController.webView.scalesPageToFit = browserOptions.enableviewportscale;
     self.inAppBrowserViewController.webView.mediaPlaybackRequiresUserAction = browserOptions.mediaplaybackrequiresuseraction;
     self.inAppBrowserViewController.webView.allowsInlineMediaPlayback = browserOptions.allowinlinemediaplayback;
-    self.inAppBrowserViewController.webView.keyboardDisplayRequiresUserAction = browserOptions.keyboarddisplayrequiresuseraction;
-    self.inAppBrowserViewController.webView.suppressesIncrementalRendering = browserOptions.suppressesincrementalrendering;
+    if (IsAtLeastiOSVersion(@"6.0")) {
+        self.inAppBrowserViewController.webView.keyboardDisplayRequiresUserAction = browserOptions.keyboarddisplayrequiresuseraction;
+        self.inAppBrowserViewController.webView.suppressesIncrementalRendering = browserOptions.suppressesincrementalrendering;
+    }
 
     if (self.viewController.modalViewController != self.inAppBrowserViewController) {
         [self.viewController presentModalViewController:self.inAppBrowserViewController animated:YES];


Mime
View raw message