You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/04/23 20:57:21 UTC

[01/17] git commit: Incremented plugin version on dev branch.

Repository: cordova-plugin-inappbrowser
Updated Branches:
  refs/heads/master e282cc9e3 -> 1c98bc5b3


Incremented plugin version on dev branch.


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/5680f18b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/5680f18b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/5680f18b

Branch: refs/heads/master
Commit: 5680f18bb4d28e6d6bc1a621e6588a010080c964
Parents: a5dedae
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Mar 5 14:38:13 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Mar 5 14:38:13 2014 -0500

----------------------------------------------------------------------
 plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/5680f18b/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 932ff83..d0046fa 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="org.apache.cordova.inappbrowser"
-      version="0.3.3">
+      version="0.3.4-dev">
 
     <name>InAppBrowser</name>
     <description>Cordova InAppBrowser Plugin</description>


[17/17] git commit: CB-6452 Updated version and RELEASENOTES.md for release 0.4.0

Posted by ia...@apache.org.
CB-6452 Updated version and RELEASENOTES.md for release 0.4.0


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/1c98bc5b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/1c98bc5b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/1c98bc5b

Branch: refs/heads/master
Commit: 1c98bc5b3f1757e1ed6c7686aa055715f9bf9372
Parents: c5061ec
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Apr 17 10:53:20 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Apr 17 10:53:20 2014 -0400

----------------------------------------------------------------------
 RELEASENOTES.md | 14 ++++++++++++++
 plugin.xml      |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/1c98bc5b/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 364f4e9..3d6cd70 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -83,3 +83,17 @@
 * CB-5534 Fix video/audio does not stop playing when browser is closed
 * CB-6172 Fix broken install on case-sensitive file-systems
 
+
+### 0.4.0 (Apr 17, 2014)
+* CB-6360: [ios] Fix for crash on iOS < 6.0 (closes #37)
+* CB-3324: [WP8] Add support for back-button inappbrowser [WP8] if there is no history -> InAppBrowser is closed
+* [WP] await async calls, resolve warnings
+* [WP] Make InAppBrowser work with embedded files, using system behavior
+* CB-6402: [WP8] pass empty string instead of null for [optional] windowFeatures string
+* CB-6422: [windows8] use cordova/exec/proxy
+* CB-6389 CB-3617: Add clearcache and clearsessioncache options to iOS (like Android)
+* Doc update: event name and example param (closes #31)
+* CB-6253: [WP] Add Network Capability to WMAppManifest.xml
+* CB-6212: [iOS] fix warnings compiled under arm64 64-bit
+* CB-6218: Update docs for BB10
+* CB-6460: Update license headers

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/1c98bc5b/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 9eea784..c9e0169 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -20,7 +20,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="org.apache.cordova.inappbrowser"
-      version="0.3.4-dev">
+      version="0.4.0">
 
     <name>InAppBrowser</name>
     <description>Cordova InAppBrowser Plugin</description>


[11/17] git commit: Make InAppBrowser work with embedded files, using system behavior

Posted by ia...@apache.org.
Make InAppBrowser work with embedded files, using system behavior

The plugin is changed to work with embedded files, using the system behavior. If one needs the system behavior, they need to pass "_system" as target when using the plugin. As the InAppBrowser for WP8 does not handle by itself the embedded pdf files, system behavior is called.

The plugin also is tested and working for wp7


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/2fc9f3da
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/2fc9f3da
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/2fc9f3da

Branch: refs/heads/master
Commit: 2fc9f3da1fc683442a4c41811e826476d2ca9dd6
Parents: e282cc9
Author: Nadya Atanasova <na...@gmail.com>
Authored: Fri Apr 11 17:57:45 2014 +0300
Committer: Nadya Atanasova <na...@gmail.com>
Committed: Fri Apr 11 17:57:45 2014 +0300

----------------------------------------------------------------------
 src/wp/InAppBrowser.cs | 106 +++++++++++++++++++++++++++++++-------------
 1 file changed, 75 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/2fc9f3da/src/wp/InAppBrowser.cs
----------------------------------------------------------------------
diff --git a/src/wp/InAppBrowser.cs b/src/wp/InAppBrowser.cs
index 454464d..ae88b51 100644
--- a/src/wp/InAppBrowser.cs
+++ b/src/wp/InAppBrowser.cs
@@ -1,21 +1,24 @@
 using System;
-using System.Net;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.Serialization;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Shapes;
 using Microsoft.Phone.Controls;
-using System.Diagnostics;
-using System.Runtime.Serialization;
-using WPCordovaClassLib.Cordova;
-using WPCordovaClassLib.Cordova.Commands;
-using WPCordovaClassLib.Cordova.JSON;
 using Microsoft.Phone.Shell;
+
+#if WP8
+using System.Threading.Tasks;
+using Windows.ApplicationModel;
+using Windows.Storage;
+using Windows.System;
+
+//Use alias in case Cordova File Plugin is enabled. Then the File class will be declared in both and error will occur.
+using IOFile = System.IO.File;
+#else
 using Microsoft.Phone.Tasks;
+#endif
 
 namespace WPCordovaClassLib.Cordova.Commands
 {
@@ -53,27 +56,29 @@ namespace WPCordovaClassLib.Cordova.Commands
             string target = args[1];
             string featString = args[2];
 
-            string[] features = featString.Split(',');
-            foreach (string str in features)
+            if (!string.IsNullOrEmpty(featString))
             {
-                try
+                string[] features = featString.Split(',');
+                foreach (string str in features)
                 {
-                    string[] split = str.Split('=');
-                    switch (split[0])
+                    try
                     {
-                        case "location":
-                            ShowLocation = split[1].ToLower().StartsWith("yes");
-                            break;
-                        case "hidden":
-                            StartHidden = split[1].ToLower().StartsWith("yes");
-                            break;
+                        string[] split = str.Split('=');
+                        switch (split[0])
+                        {
+                            case "location":
+                                ShowLocation = split[1].StartsWith("yes", StringComparison.OrdinalIgnoreCase);
+                                break;
+                            case "hidden":
+                                StartHidden = split[1].StartsWith("yes", StringComparison.OrdinalIgnoreCase);
+                                break;
+                        }
+                    }
+                    catch (Exception)
+                    {
+                        // some sort of invalid param was passed, moving on ...
                     }
                 }
-                catch(Exception)
-                {
-                    // some sort of invalid param was passed, moving on ...
-                }
-                
             }
             /*
                 _self - opens in the Cordova WebView if url is in the white-list, else it opens in the InAppBrowser 
@@ -184,7 +189,6 @@ namespace WPCordovaClassLib.Cordova.Commands
             //throw new NotImplementedException("Windows Phone does not currently support 'insertCSS'");
         }
 
-
         private void ShowCordovaBrowser(string url)
         {
             Uri loc = new Uri(url, UriKind.RelativeOrAbsolute);
@@ -208,13 +212,53 @@ namespace WPCordovaClassLib.Cordova.Commands
             });
         }
 
+#if WP8
+        private async void ShowSystemBrowser(string url)
+        {
+            var pathUri = new Uri(url, UriKind.Absolute);
+            if (pathUri.Scheme == Uri.UriSchemeHttp || pathUri.Scheme == Uri.UriSchemeHttps)
+            {
+                Launcher.LaunchUriAsync(pathUri);
+                return;
+            }
+
+            var file = await GetFile(pathUri.AbsolutePath.Replace('/', Path.DirectorySeparatorChar));
+            if (file != null)
+            {
+                Launcher.LaunchFileAsync(file);
+            }
+            else
+            {
+                Debug.WriteLine("File not found.");
+            }
+        }
+
+        private async Task<StorageFile> GetFile(string fileName)
+        {
+            //first try to get the file from the isolated storage
+            var localFolder = ApplicationData.Current.LocalFolder;
+            if (IOFile.Exists(Path.Combine(localFolder.Path, fileName)))
+            {
+                return await localFolder.GetFileAsync(fileName);
+            }
+
+            //if file is not found try to get it from the xap
+            var filePath = Path.Combine(Package.Current.InstalledLocation.Path, fileName);
+            if (IOFile.Exists(filePath))
+            {
+                return await StorageFile.GetFileFromPathAsync(filePath);
+            }
+
+            return null;
+        }
+#else
         private void ShowSystemBrowser(string url)
         {
             WebBrowserTask webBrowserTask = new WebBrowserTask();
             webBrowserTask.Uri = new Uri(url, UriKind.Absolute);
             webBrowserTask.Show();
         }
-
+#endif
 
         private void ShowInAppBrowser(string url)
         {
@@ -326,7 +370,7 @@ namespace WPCordovaClassLib.Cordova.Commands
                 {
 #if WP8
                     browser.GoBack();
-#else           
+#else
                     browser.InvokeScript("execScript", "history.back();");
 #endif
                 }
@@ -405,4 +449,4 @@ namespace WPCordovaClassLib.Cordova.Commands
         }
 
     }
-}
+}
\ No newline at end of file


[04/17] git commit: CB-6212 iOS: fix warnings compiled under arm64 64-bit

Posted by ia...@apache.org.
CB-6212 iOS: fix warnings compiled under arm64 64-bit


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

Branch: refs/heads/master
Commit: fceea502a3f7f3308247a4bb2841b60a5d902c12
Parents: aa9a5db
Author: James Jong <wj...@gmail.com>
Authored: Wed Mar 12 13:35:17 2014 -0400
Committer: James Jong <wj...@gmail.com>
Committed: Wed Mar 12 13:35:17 2014 -0400

----------------------------------------------------------------------
 src/ios/CDVInAppBrowser.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/fceea502/src/ios/CDVInAppBrowser.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVInAppBrowser.m b/src/ios/CDVInAppBrowser.m
index 88b737c..2b0dc41 100644
--- a/src/ios/CDVInAppBrowser.m
+++ b/src/ios/CDVInAppBrowser.m
@@ -395,7 +395,7 @@
     if (self.callbackId != nil) {
         NSString* url = [self.inAppBrowserViewController.currentURL absoluteString];
         CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
-                                                      messageAsDictionary:@{@"type":@"loaderror", @"url":url, @"code": [NSNumber numberWithInt:error.code], @"message": error.localizedDescription}];
+                                                      messageAsDictionary:@{@"type":@"loaderror", @"url":url, @"code": [NSNumber numberWithInteger:error.code], @"message": error.localizedDescription}];
         [pluginResult setKeepCallback:[NSNumber numberWithBool:YES]];
 
         [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackId];
@@ -834,7 +834,7 @@
 - (void)webView:(UIWebView*)theWebView didFailLoadWithError:(NSError*)error
 {
     // log fail message, stop spinner, update back/forward
-    NSLog(@"webView:didFailLoadWithError - %i: %@", error.code, [error localizedDescription]);
+    NSLog(@"webView:didFailLoadWithError - %ld: %@", (long)error.code, [error localizedDescription]);
 
     self.backButton.enabled = theWebView.canGoBack;
     self.forwardButton.enabled = theWebView.canGoForward;


[15/17] git commit: CB-6360: Fix for crash on iOS < 6.0 (closes #37)

Posted by ia...@apache.org.
CB-6360: Fix for crash on iOS < 6.0 (closes #37)


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/932f078e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/932f078e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/932f078e

Branch: refs/heads/master
Commit: 932f078e2dfd31a8208b9a3c0d53852289f94826
Parents: 1c32236
Author: Robin North <gi...@robinnorth.co.uk>
Authored: Wed Apr 9 16:48:00 2014 +0100
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue Apr 15 15:21:39 2014 -0700

----------------------------------------------------------------------
 src/ios/CDVInAppBrowser.m | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/932f078e/src/ios/CDVInAppBrowser.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVInAppBrowser.m b/src/ios/CDVInAppBrowser.m
index 6625545..68675c5 100644
--- a/src/ios/CDVInAppBrowser.m
+++ b/src/ios/CDVInAppBrowser.m
@@ -552,7 +552,11 @@
     self.addressLabel.enabled = YES;
     self.addressLabel.hidden = NO;
     self.addressLabel.lineBreakMode = NSLineBreakByTruncatingTail;
-    self.addressLabel.minimumScaleFactor = 10.000;
+    if (IsAtLeastiOSVersion(@"6.0")) {
+        self.addressLabel.minimumScaleFactor = 10.0/[UIFont labelFontSize];
+    } else {
+        self.addressLabel.minimumFontSize = 10.000;
+    }
     self.addressLabel.multipleTouchEnabled = NO;
     self.addressLabel.numberOfLines = 1;
     self.addressLabel.opaque = NO;


[13/17] git commit: await async calls, resolve warnings

Posted by ia...@apache.org.
await async calls, resolve warnings


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/34c29dc2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/34c29dc2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/34c29dc2

Branch: refs/heads/master
Commit: 34c29dc2ecf66dcde5fc96f1f85295d7332bde14
Parents: aa6c151
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Apr 14 17:01:35 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Apr 14 17:01:35 2014 -0700

----------------------------------------------------------------------
 src/wp/InAppBrowser.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/34c29dc2/src/wp/InAppBrowser.cs
----------------------------------------------------------------------
diff --git a/src/wp/InAppBrowser.cs b/src/wp/InAppBrowser.cs
index ae88b51..7239c8a 100644
--- a/src/wp/InAppBrowser.cs
+++ b/src/wp/InAppBrowser.cs
@@ -218,14 +218,14 @@ namespace WPCordovaClassLib.Cordova.Commands
             var pathUri = new Uri(url, UriKind.Absolute);
             if (pathUri.Scheme == Uri.UriSchemeHttp || pathUri.Scheme == Uri.UriSchemeHttps)
             {
-                Launcher.LaunchUriAsync(pathUri);
+                await Launcher.LaunchUriAsync(pathUri);
                 return;
             }
 
             var file = await GetFile(pathUri.AbsolutePath.Replace('/', Path.DirectorySeparatorChar));
             if (file != null)
             {
-                Launcher.LaunchFileAsync(file);
+                await Launcher.LaunchFileAsync(file);
             }
             else
             {


[08/17] git commit: CB-3617: Document clearcache and clearsessioncache for ios

Posted by ia...@apache.org.
CB-3617: Document clearcache and clearsessioncache for ios


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/04de070d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/04de070d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/04de070d

Branch: refs/heads/master
Commit: 04de070dcd613db5a4d012b91831f730ca506e2b
Parents: 22c7a0e
Author: Ian Clelland <ic...@chromium.org>
Authored: Mon Apr 7 10:08:20 2014 -0600
Committer: Ian Clelland <ic...@chromium.org>
Committed: Mon Apr 7 10:10:12 2014 -0600

----------------------------------------------------------------------
 doc/index.md | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/04de070d/doc/index.md
----------------------------------------------------------------------
diff --git a/doc/index.md b/doc/index.md
index 5201927..1db39db 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -65,6 +65,8 @@ instance, or the system browser.
     - __closebuttoncaption__: set to a string to use as the __Done__ button's caption. Note that you need to localize this value yourself.
     - __disallowoverscroll__: Set to `yes` or `no` (default is `no`). Turns on/off the UIWebViewBounce property.
     - __hidden__: set to `yes` to create the browser and load the page, but not show it. The loadstop event fires when loading is complete. Omit or set to `no` (default) to have the browser open and load normally.
+    - __clearcache__: set to `yes` to have the browser's cookie cache cleared before the new window is opened
+    - __clearsessioncache__: set to `yes` to have the session cookie cache cleared before the new window is opened
     - __toolbar__:  set to `yes` or `no` to turn the toolbar on or off for the InAppBrowser (defaults to `yes`)
     - __enableViewportScale__:  Set to `yes` or `no` to prevent viewport scaling through a meta tag (defaults to `no`).
     - __mediaPlaybackRequiresUserAction__: Set to `yes` or `no` to prevent HTML5 audio or video from autoplaying (defaults to `no`).


[05/17] git commit: CB-6253 Add Network Capability to WMAppManifest.xml

Posted by ia...@apache.org.
CB-6253 Add Network Capability to WMAppManifest.xml


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/749d55c6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/749d55c6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/749d55c6

Branch: refs/heads/master
Commit: 749d55c67688404399ad2902c50ebd6e4b584460
Parents: fceea50
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Wed Mar 19 22:26:01 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Wed Mar 19 22:26:01 2014 -0700

----------------------------------------------------------------------
 plugin.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/749d55c6/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index d0046fa..13adc8d 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -93,6 +93,10 @@
 
     <!-- wp7 -->
     <platform name="wp7">
+        <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+            <Capability Name="ID_CAP_NETWORKING"/>
+        </config-file>
+
         <js-module src="www/inappbrowser.js" name="inappbrowser">
             <clobbers target="window.open" />
         </js-module>
@@ -107,6 +111,10 @@
 
     <!-- wp8 -->
     <platform name="wp8">
+        <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+            <Capability Name="ID_CAP_NETWORKING"/>
+        </config-file>
+                
         <js-module src="www/inappbrowser.js" name="inappbrowser">
             <clobbers target="window.open" />
         </js-module>


[09/17] git commit: CB-6422 [windows8] use cordova/exec/proxy

Posted by ia...@apache.org.
CB-6422 [windows8] use cordova/exec/proxy


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/25f306d1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/25f306d1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/25f306d1

Branch: refs/heads/master
Commit: 25f306d11eb090805417a94e5feeb594e50959c0
Parents: 04de070
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Apr 8 16:29:32 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Apr 8 16:29:32 2014 -0700

----------------------------------------------------------------------
 www/windows8/InAppBrowserProxy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/25f306d1/www/windows8/InAppBrowserProxy.js
----------------------------------------------------------------------
diff --git a/www/windows8/InAppBrowserProxy.js b/www/windows8/InAppBrowserProxy.js
index d173778..944284e 100644
--- a/www/windows8/InAppBrowserProxy.js
+++ b/www/windows8/InAppBrowserProxy.js
@@ -108,4 +108,4 @@ var IAB = {
 module.exports = IAB;
 
 
-require("cordova/windows8/commandProxy").add("InAppBrowser", module.exports);
+require("cordova/exec/proxy").add("InAppBrowser", module.exports);


[06/17] git commit: Doc update: event name and example param (closes #31)

Posted by ia...@apache.org.
Doc update: event name and example param (closes #31)


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/9399ed39
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/9399ed39
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/9399ed39

Branch: refs/heads/master
Commit: 9399ed39559d94c51567b226a8bf2cfb390de15c
Parents: 749d55c
Author: Rocco Georgi <ro...@pavingways.com>
Authored: Sun Mar 23 00:04:24 2014 +0100
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Mar 24 15:42:53 2014 -0700

----------------------------------------------------------------------
 doc/index.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/9399ed39/doc/index.md
----------------------------------------------------------------------
diff --git a/doc/index.md b/doc/index.md
index e82b29b..5201927 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -56,7 +56,7 @@ instance, or the system browser.
     Android only:
 
     - __closebuttoncaption__: set to a string to use as the __Done__ button's caption.
-    - __hidden__: set to `yes` to create the browser and load the page, but not show it. The load event fires when loading is complete. Omit or set to `no` (default) to have the browser open and load normally.
+    - __hidden__: set to `yes` to create the browser and load the page, but not show it. The loadstop event fires when loading is complete. Omit or set to `no` (default) to have the browser open and load normally.
     - __clearcache__: set to `yes` to have the browser's cookie cache cleared before the new window is opened
     - __clearsessioncache__: set to `yes` to have the session cookie cache cleared before the new window is opened
 
@@ -64,7 +64,7 @@ instance, or the system browser.
 
     - __closebuttoncaption__: set to a string to use as the __Done__ button's caption. Note that you need to localize this value yourself.
     - __disallowoverscroll__: Set to `yes` or `no` (default is `no`). Turns on/off the UIWebViewBounce property.
-    - __hidden__: set to `yes` to create the browser and load the page, but not show it. The load event fires when loading is complete. Omit or set to `no` (default) to have the browser open and load normally.
+    - __hidden__: set to `yes` to create the browser and load the page, but not show it. The loadstop event fires when loading is complete. Omit or set to `no` (default) to have the browser open and load normally.
     - __toolbar__:  set to `yes` or `no` to turn the toolbar on or off for the InAppBrowser (defaults to `yes`)
     - __enableViewportScale__:  Set to `yes` or `no` to prevent viewport scaling through a meta tag (defaults to `no`).
     - __mediaPlaybackRequiresUserAction__: Set to `yes` or `no` to prevent HTML5 audio or video from autoplaying (defaults to `no`).
@@ -139,7 +139,7 @@ The object returned from a call to `window.open`.
 ### Quick Example
 
     var ref = window.open('http://apache.org', '_blank', 'location=yes');
-    ref.addEventListener('loadstart', function() { alert(event.url); });
+    ref.addEventListener('loadstart', function(event) { alert(event.url); });
 
 ## removeEventListener
 
@@ -169,7 +169,7 @@ The function is passed an `InAppBrowserEvent` object.
 ### Quick Example
 
     var ref = window.open('http://apache.org', '_blank', 'location=yes');
-    var myCallback = function() { alert(event.url); }
+    var myCallback = function(event) { alert(event.url); }
     ref.addEventListener('loadstart', myCallback);
     ref.removeEventListener('loadstart', myCallback);
 


[14/17] git commit: CB-3324 Add support for back-button inappbrowser [WP8] if there is no history -> InAppBrowser is closed

Posted by ia...@apache.org.
CB-3324 Add support for back-button inappbrowser [WP8] if there is no history -> InAppBrowser is closed


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/1c322363
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/1c322363
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/1c322363

Branch: refs/heads/master
Commit: 1c32236353d8fc118a8449464ba7cd8f93a5eee2
Parents: 34c29dc
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Apr 14 17:11:36 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Apr 14 17:11:36 2014 -0700

----------------------------------------------------------------------
 src/wp/InAppBrowser.cs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/1c322363/src/wp/InAppBrowser.cs
----------------------------------------------------------------------
diff --git a/src/wp/InAppBrowser.cs b/src/wp/InAppBrowser.cs
index 7239c8a..4026a95 100644
--- a/src/wp/InAppBrowser.cs
+++ b/src/wp/InAppBrowser.cs
@@ -331,6 +331,8 @@ namespace WPCordovaClassLib.Cordova.Commands
                             bar.IsVisible = !StartHidden;
                             AppBar = bar;
 
+                            page.BackKeyPress += page_BackKeyPress;
+
                         }
 
                     }
@@ -338,6 +340,23 @@ namespace WPCordovaClassLib.Cordova.Commands
             });
         }
 
+        void page_BackKeyPress(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+#if WP8
+            if (browser.CanGoBack)
+            {
+                browser.GoBack();
+            }
+            else
+            {
+                close();
+            }
+            e.Cancel = true;
+#else
+                    browser.InvokeScript("execScript", "history.back();");
+#endif
+        }
+
         void browser_LoadCompleted(object sender, System.Windows.Navigation.NavigationEventArgs e)
         {
 
@@ -405,8 +424,10 @@ namespace WPCordovaClassLib.Cordova.Commands
                                 grid.Children.Remove(browser);
                             }
                             page.ApplicationBar = null;
+                            page.BackKeyPress -= page_BackKeyPress;
                         }
                     }
+                   
                     browser = null;
                     string message = "{\"type\":\"exit\"}";
                     PluginResult result = new PluginResult(PluginResult.Status.OK, message);


[12/17] git commit: Merge branch 'wp8-work-with-embedded-files' of https://github.com/Icenium/cordova-plugin-inappbrowser into dev

Posted by ia...@apache.org.
Merge branch 'wp8-work-with-embedded-files' of https://github.com/Icenium/cordova-plugin-inappbrowser into dev


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

Branch: refs/heads/master
Commit: aa6c1519d28f0bee422947d7413e86f14acaefe5
Parents: bddf86c 2fc9f3d
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Apr 14 12:20:35 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Apr 14 12:20:35 2014 -0700

----------------------------------------------------------------------
 src/wp/InAppBrowser.cs | 106 +++++++++++++++++++++++++++++++-------------
 1 file changed, 75 insertions(+), 31 deletions(-)
----------------------------------------------------------------------



[03/17] git commit: CB-6218 Update docs for BB10

Posted by ia...@apache.org.
CB-6218 Update docs for BB10


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

Branch: refs/heads/master
Commit: aa9a5db9413ebaf3fec60e41b24591c64953b12a
Parents: 7dbad60
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Tue Mar 11 12:22:17 2014 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Tue Mar 11 12:22:37 2014 -0400

----------------------------------------------------------------------
 doc/index.md | 6 ------
 1 file changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/aa9a5db9/doc/index.md
----------------------------------------------------------------------
diff --git a/doc/index.md b/doc/index.md
index 61f702c..e82b29b 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -133,7 +133,6 @@ The object returned from a call to `window.open`.
 
 - Amazon Fire OS
 - Android
-- BlackBerry 10
 - iOS
 - Windows Phone 7 and 8
 
@@ -164,7 +163,6 @@ The function is passed an `InAppBrowserEvent` object.
 
 - Amazon Fire OS
 - Android
-- BlackBerry 10
 - iOS
 - Windows Phone 7 and 8
 
@@ -187,7 +185,6 @@ The function is passed an `InAppBrowserEvent` object.
 
 - Amazon Fire OS
 - Android
-- BlackBerry 10
 - iOS
 - Windows Phone 7 and 8
 
@@ -208,7 +205,6 @@ The function is passed an `InAppBrowserEvent` object.
 
 - Amazon Fire OS
 - Android
-- BlackBerry 10
 - iOS
 
 ### Quick Example
@@ -240,7 +236,6 @@ The function is passed an `InAppBrowserEvent` object.
 
 - Amazon Fire OS
 - Android
-- BlackBerry 10
 - iOS
 
 ### Quick Example
@@ -268,7 +263,6 @@ The function is passed an `InAppBrowserEvent` object.
 
 - Amazon Fire OS
 - Android
-- BlackBerry 10
 - iOS
 
 ### Quick Example


[10/17] git commit: CB-6402 [WP8] pass empty string instead of null for [optional] windowFeatures string

Posted by ia...@apache.org.
CB-6402 [WP8] pass empty string instead of null for [optional] windowFeatures string


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

Branch: refs/heads/master
Commit: bddf86c3cefd9d787876d15e771beb499e43eb2f
Parents: 25f306d
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Wed Apr 9 12:26:47 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Wed Apr 9 12:26:47 2014 -0700

----------------------------------------------------------------------
 www/inappbrowser.js | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/bddf86c3/www/inappbrowser.js
----------------------------------------------------------------------
diff --git a/www/inappbrowser.js b/www/inappbrowser.js
index ebcfa24..3535b6f 100644
--- a/www/inappbrowser.js
+++ b/www/inappbrowser.js
@@ -90,6 +90,8 @@ module.exports = function(strUrl, strWindowName, strWindowFeatures) {
        iab._eventHandler(eventname);
     };
 
+    strWindowFeatures = strWindowFeatures || "";
+
     exec(cb, cb, "InAppBrowser", "open", [strUrl, strWindowName, strWindowFeatures]);
     return iab;
 };


[02/17] git commit: Tweak RELEASENOTES.md (missed a bug fix in last release)

Posted by ia...@apache.org.
Tweak RELEASENOTES.md (missed a bug fix in last release)


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/7dbad601
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/7dbad601
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/7dbad601

Branch: refs/heads/master
Commit: 7dbad601f0321095bfe06bdd91b5576dfe55e433
Parents: 5680f18
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Mar 6 20:48:00 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Mar 6 20:48:00 2014 -0500

----------------------------------------------------------------------
 RELEASENOTES.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/7dbad601/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 2d40026..364f4e9 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -80,5 +80,6 @@
 * Removed some iOS6 Deprecations
 
 ### 0.3.3 (Mar 5, 2014)
+* CB-5534 Fix video/audio does not stop playing when browser is closed
 * CB-6172 Fix broken install on case-sensitive file-systems
 


[16/17] git commit: CB-6460: Update license headers

Posted by ia...@apache.org.
CB-6460: Update license headers


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

Branch: refs/heads/master
Commit: c5061ec333fae8e214a867443bc53833bba0d3c6
Parents: 932f078
Author: Ian Clelland <ic...@chromium.org>
Authored: Wed Apr 16 16:19:05 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Wed Apr 16 16:19:05 2014 -0400

----------------------------------------------------------------------
 plugin.xml                         | 18 ++++++++++++++++++
 src/amazon/InAppChromeClient.java  | 18 ++++++++++++++++++
 src/android/InAppChromeClient.java | 18 ++++++++++++++++++
 src/blackberry10/README.md         | 18 ++++++++++++++++++
 src/wp/InAppBrowser.cs             | 16 +++++++++++++++-
 5 files changed, 87 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/c5061ec3/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 13adc8d..9eea784 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="org.apache.cordova.inappbrowser"

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/c5061ec3/src/amazon/InAppChromeClient.java
----------------------------------------------------------------------
diff --git a/src/amazon/InAppChromeClient.java b/src/amazon/InAppChromeClient.java
index 7f2ddc3..37cf101 100644
--- a/src/amazon/InAppChromeClient.java
+++ b/src/amazon/InAppChromeClient.java
@@ -1,3 +1,21 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package org.apache.cordova.inappbrowser;
 
 import org.apache.cordova.CordovaWebView;

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/c5061ec3/src/android/InAppChromeClient.java
----------------------------------------------------------------------
diff --git a/src/android/InAppChromeClient.java b/src/android/InAppChromeClient.java
index f3fc741..a2145e6 100644
--- a/src/android/InAppChromeClient.java
+++ b/src/android/InAppChromeClient.java
@@ -1,3 +1,21 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
 package org.apache.cordova.inappbrowser;
 
 import org.apache.cordova.CordovaWebView;

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/c5061ec3/src/blackberry10/README.md
----------------------------------------------------------------------
diff --git a/src/blackberry10/README.md b/src/blackberry10/README.md
index 0b16789..f0fa860 100644
--- a/src/blackberry10/README.md
+++ b/src/blackberry10/README.md
@@ -1,3 +1,21 @@
+<!---
+ license: Licensed to the Apache Software Foundation (ASF) under one
+         or more contributor license agreements.  See the NOTICE file
+         distributed with this work for additional information
+         regarding copyright ownership.  The ASF licenses this file
+         to you under the Apache License, Version 2.0 (the
+         "License"); you may not use this file except in compliance
+         with the License.  You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+         Unless required by applicable law or agreed to in writing,
+         software distributed under the License is distributed on an
+         "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+         KIND, either express or implied.  See the License for the
+         specific language governing permissions and limitations
+         under the License.
+-->
 # BlackBerry 10 In-App-Browser Plugin
 
 The in app browser functionality is entirely contained within common js. There is no native implementation required.

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/c5061ec3/src/wp/InAppBrowser.cs
----------------------------------------------------------------------
diff --git a/src/wp/InAppBrowser.cs b/src/wp/InAppBrowser.cs
index 4026a95..cbd5d26 100644
--- a/src/wp/InAppBrowser.cs
+++ b/src/wp/InAppBrowser.cs
@@ -1,4 +1,18 @@
-using System;
+/*
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.Serialization;


[07/17] git commit: CB-6389 CB-3617: Add clearcache and clearsessioncache options to iOS (like Android)

Posted by ia...@apache.org.
CB-6389 CB-3617: Add clearcache and clearsessioncache options to iOS (like Android)


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/22c7a0e5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/22c7a0e5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/22c7a0e5

Branch: refs/heads/master
Commit: 22c7a0e51e560b35e46e94dea667a5fb0ef5a270
Parents: 9399ed3
Author: mbradshawabs <mb...@americanbible.org>
Authored: Wed Apr 2 09:19:05 2014 -0500
Committer: Ian Clelland <ic...@chromium.org>
Committed: Wed Apr 2 15:04:48 2014 -0400

----------------------------------------------------------------------
 src/ios/CDVInAppBrowser.h |  2 ++
 src/ios/CDVInAppBrowser.m | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/22c7a0e5/src/ios/CDVInAppBrowser.h
----------------------------------------------------------------------
diff --git a/src/ios/CDVInAppBrowser.h b/src/ios/CDVInAppBrowser.h
index 8e2ab12..e643962 100644
--- a/src/ios/CDVInAppBrowser.h
+++ b/src/ios/CDVInAppBrowser.h
@@ -45,6 +45,8 @@
 @property (nonatomic, assign) BOOL toolbar;
 @property (nonatomic, copy) NSString* closebuttoncaption;
 @property (nonatomic, copy) NSString* toolbarposition;
+@property (nonatomic, assign) BOOL clearcache;
+@property (nonatomic, assign) BOOL clearsessioncache;
 
 @property (nonatomic, copy) NSString* presentationstyle;
 @property (nonatomic, copy) NSString* transitionstyle;

http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/22c7a0e5/src/ios/CDVInAppBrowser.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVInAppBrowser.m b/src/ios/CDVInAppBrowser.m
index 2b0dc41..6625545 100644
--- a/src/ios/CDVInAppBrowser.m
+++ b/src/ios/CDVInAppBrowser.m
@@ -115,6 +115,29 @@
 - (void)openInInAppBrowser:(NSURL*)url withOptions:(NSString*)options
 {
     CDVInAppBrowserOptions* browserOptions = [CDVInAppBrowserOptions parseOptions:options];
+
+    if (browserOptions.clearcache) {
+        NSHTTPCookie *cookie;
+        NSHTTPCookieStorage *storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+        for (cookie in [storage cookies])
+        {
+            if (![cookie.domain isEqual: @".^filecookies^"]) {
+                [storage deleteCookie:cookie];
+            }
+        }
+    }
+
+    if (browserOptions.clearsessioncache) {
+        NSHTTPCookie *cookie;
+        NSHTTPCookieStorage *storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+        for (cookie in [storage cookies])
+        {
+            if (![cookie.domain isEqual: @".^filecookies^"] && cookie.isSessionOnly) {
+                [storage deleteCookie:cookie];
+            }
+        }
+    }
+
     if (self.inAppBrowserViewController == nil) {
         NSString* originalUA = [CDVUserAgentUtil originalUserAgent];
         self.inAppBrowserViewController = [[CDVInAppBrowserViewController alloc] initWithUserAgent:originalUA prevUserAgent:[self.commandDelegate userAgent] browserOptions: browserOptions];
@@ -885,6 +908,8 @@
         self.toolbar = YES;
         self.closebuttoncaption = nil;
         self.toolbarposition = kInAppBrowserToolbarBarPositionBottom;
+        self.clearcache = NO;
+        self.clearsessioncache = NO;
 
         self.enableviewportscale = NO;
         self.mediaplaybackrequiresuseraction = NO;