CB-10441 Add auto tests for InAppBrowser plugin

2026-02-17 00:00:05 +08:00 · 2016-01-27 13:00:28 +03:00
31 changed files with 390 additions and 2090 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,22 +0,0 @@
-<!--
-Please make sure the checklist boxes are all checked before submitting the PR. The checklist
-is intended as a quick reference, for complete details please see our Contributor Guidelines:
-
-http://cordova.apache.org/contribute/contribute_guidelines.html
-
-Thanks!
-->
-
-### Platforms affected
-
-
-### What does this PR do?
-
-
-### What testing has been done on this change?
-
-
-### Checklist
- [ ] [Reported an issue](http://cordova.apache.org/contribute/issues.html) in the JIRA database
- [ ] Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform affected.
- [ ] Added automated test coverage as appropriate for this change.
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ Thumbs.db
 *.swp
 *.user

-node_modules



--- a/.jshintrc
+++ b/.jshintrc
@@ -1,16 +0,0 @@
-{
-    "browser": true
-  , "devel": true
-  , "bitwise": true
-  , "undef": true
-  , "trailing": true
-  , "quotmark": false
-  , "indent": 4
-  , "unused": "vars"
-  , "latedef": "nofunc"
-  , "globals": {
-        "module": false,
-        "exports": false,
-        "require": false
-    }
-}
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +0,0 @@
-language: node_js
-sudo: false
-node_js:
-  - "4.2"
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,7 +26,7 @@ Anyone can contribute to Cordova. And we need your contributions.
 There are multiple ways to contribute: report bugs, improve the docs, and
 contribute code.

-For instructions on this, start with the
+For instructions on this, start with the 
 [contribution overview](http://cordova.apache.org/contribute/).

 The details are explained there, but the important items are:
@@ -35,30 +35,3 @@ The details are explained there, but the important items are:
 - Run the tests so your patch doesn't break existing functionality.

 We look forward to your contributions!
-
-The notes on [Commit Workflow](https://github.com/apache/cordova-coho/blob/master/docs/committer-workflow.md#commit-workflow) can be helpful even if you are not a committer.
-
-## Running plugin tests
-
-* clone and install [cordova-plugin-test-framework](https://github.com/apache/cordova-plugin-test-framework)
-```
-git clone git@github.com:apache/cordova-plugin-test-framework.git
-```
-* edit ```cordova-plugin-test-framework/www/assets/index.html``` and add the following line
-```
-<meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com http://cordova.apache.org http://google.co.uk https://google.co.uk 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *">
-```
-* create test project
-```
-cordova create plugintest
-cd plugintest
-cordova platform add android
-cordova plugin add ../cordova-plugin-inappbrowser
-cordova plugin add ../cordova-plugin-inappbrowser/tests
-cordova plugin add ../cordova-plugin-test-framework
-```
-* edit ```config.xml``` and replace ```<content src="index.html" />``` with ```<content src="cdvtests/index.html" />```
-* run application
-```
-cordova run
-```
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
---
-title: Inappbrowser
-description: Open an in-app browser window.
---
 <!--
 # license: Licensed to the Apache Software Foundation (ASF) under one
 #         or more contributor license agreements.  See the NOTICE file
@@ -21,16 +17,8 @@ description: Open an in-app browser window.
 #         under the License.
 -->

-|Android 4.4|Android 5.1|Android 6.0|iOS 9.3|iOS 10.0|Windows 10 Store|Travis CI|
-|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
-|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-inappbrowser)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-inappbrowser/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-inappbrowser)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-inappbrowser/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=android-6.0,PLUGIN=cordova-plugin-inappbrowser)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-6.0,PLUGIN=cordova-plugin-inappbrowser/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-inappbrowser)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-inappbrowser/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-inappbrowser)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-inappbrowser/)|[![Build Status](http://cordova-ci.cloudapp.net:8080/buildStatus/icon?job=cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-inappbrowser)](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-inappbrowser/)|[![Build Status](https://travis-ci.org/apache/cordova-plugin-inappbrowser.svg?branch=master)](https://travis-ci.org/apache/cordova-plugin-inappbrowser)|
-
 # cordova-plugin-inappbrowser

-You can show helpful articles, videos, and web resources inside of your app. Users can view web pages without leaving your app.
-
-> To get a few ideas, check out the [sample](#sample) at the bottom of this page or go straight to the [reference](#reference) content.
-
 This plugin provides a web browser view that displays when calling `cordova.InAppBrowser.open()`.

    var ref = cordova.InAppBrowser.open('http://apache.org', '_blank', 'location=yes');
@@ -66,10 +54,10 @@ Although `window.open` is in the global scope, InAppBrowser is not available unt
        console.log("window.open works well");
    }

-Report issues with this plugin on the [Apache Cordova issue tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Plugin%20InAppBrowser%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC)
+:warning: Report issues on the [Apache Cordova issue tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Plugin%20InAppBrowser%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC)
+


-## <a id="reference">Reference</a>
 ## Installation

    cordova plugin add cordova-plugin-inappbrowser
@@ -89,7 +77,7 @@ instance, or the system browser.

    var ref = cordova.InAppBrowser.open(url, target, options);

- __ref__: Reference to the `InAppBrowser` window when the target is set to `'_blank'`. _(InAppBrowser)_
+- __ref__: Reference to the `InAppBrowser` window. _(InAppBrowser)_

 - __url__: The URL to load _(String)_. Call `encodeURI()` on this if the URL contains Unicode characters.

@@ -112,9 +100,6 @@ instance, or the system browser.
    - __clearsessioncache__: set to `yes` to have the session cookie cache cleared before the new window is opened
    - __zoom__: set to `yes` to show Android browser's zoom controls, set to `no` to hide them.  Default value is `yes`.
    - __hardwareback__: set to `yes` to use the hardware back button to navigate backwards through the `InAppBrowser`'s history. If there is no previous page, the `InAppBrowser` will close.  The default value is `yes`, so you must set it to `no` if you want the back button to simply close the InAppBrowser.
-    - __mediaPlaybackRequiresUserAction__: Set to `yes` to prevent HTML5 audio or video from autoplaying (defaults to `no`).
-    - __shouldPauseOnSuspend__: Set to `yes` to make InAppBrowser WebView to pause/resume with the app to stop background audio (this may be required to avoid Google Play issues like described in [CB-11013](https://issues.apache.org/jira/browse/CB-11013)).
-    - __useWideViewPort__: Sets whether the WebView should enable support for the "viewport" HTML meta tag or should use a wide viewport. When the value of the setting is `no`, the layout width is always set to the width of the WebView control in device-independent (CSS) pixels. When the value is `yes` and the page contains the viewport meta tag, the value of the width specified in the tag is used. If the page does not contain the tag or does not provide a width, then a wide viewport will be used. (defaults to `yes`).

    iOS only:

@@ -125,7 +110,7 @@ instance, or the system browser.
    - __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` to prevent HTML5 audio or video from autoplaying (defaults to `no`).
+    - __mediaPlaybackRequiresUserAction__: Set to `yes` or `no` to prevent HTML5 audio or video from autoplaying (defaults to `no`).
    - __allowInlineMediaPlayback__: Set to `yes` or `no` to allow in-line HTML5 media playback, displaying within the browser window rather than a device-specific playback interface. The HTML's `video` element must also include the `webkit-playsinline` attribute (defaults to `no`)
    - __keyboardDisplayRequiresUserAction__: Set to `yes` or `no` to open the keyboard when form elements receive focus via JavaScript's `focus()` call (defaults to `yes`).
    - __suppressesIncrementalRendering__: Set to `yes` or `no` to wait until all new view content is received before being rendered (defaults to `no`).
@@ -137,7 +122,6 @@ instance, or the system browser.

    - __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.
    - __fullscreen__: set to `yes` to create the browser control without a border around it. Please note that if __location=no__ is also specified, there will be no control presented to user to close IAB window.
-    - __hardwareback__: works the same way as on Android platform.

 ### Supported Platforms

@@ -146,7 +130,6 @@ instance, or the system browser.
 - BlackBerry 10
 - Firefox OS
 - iOS
- OSX
 - Windows 8 and 8.1
 - Windows Phone 7 and 8
 - Browser
@@ -187,17 +170,11 @@ opened with `target='_blank'`. The rules might look like these
 }
 ```

-### OSX Quirks
-
-At the moment the only supported target in OSX is `_system`.
-
-`_blank` and `_self` targets are not yet implemented and are ignored silently. Pull requests and patches to get these to work are greatly appreciated.
-
 ### Windows Quirks

 Windows 8.0, 8.1 and Windows Phone 8.1 don't support remote urls to be opened in the Cordova WebView so remote urls are always showed in the system's web browser if opened with `target='_self'`.

-On Windows 10 if the URL is NOT in the white list and is opened with `target='_self'` it will be showed in the system's web browser instead of InAppBrowser popup.
+On Windows 10 if the URL is NOT in the white list and is opened with `target='_self'` it will be showed in the system's web browser instead of InAppBrowser popup. 

 Similar to Firefox OS IAB window visual behaviour can be overridden via `inAppBrowserWrap`/`inAppBrowserWrapFullscreen` CSS classes

@@ -209,7 +186,7 @@ Similar to Firefox OS IAB window visual behaviour can be overridden via `inAppBr

 ## InAppBrowser

-The object returned from a call to `cordova.InAppBrowser.open` when the target is set to `'_blank'`.
+The object returned from a call to `cordova.InAppBrowser.open`.

 ### Methods

@@ -217,13 +194,12 @@ The object returned from a call to `cordova.InAppBrowser.open` when the target i
 - removeEventListener
 - close
 - show
- hide
 - executeScript
 - insertCSS

-## InAppBrowser.addEventListener
+## addEventListener

-> Adds a listener for an event from the `InAppBrowser`. (Only available when the target is set to `'_blank'`)
+> Adds a listener for an event from the `InAppBrowser`.

    ref.addEventListener(eventname, callback);

@@ -238,76 +214,6 @@ The object returned from a call to `cordova.InAppBrowser.open` when the target i

 - __callback__: the function that executes when the event fires. The function is passed an `InAppBrowserEvent` object as a parameter.

-## Example
-
-```javascript
-
-var inAppBrowserRef;
-
-function showHelp(url) {
-
-    var target = "_blank";
-
-    var options = "location=yes,hidden=yes";
-
-    inAppBrowserRef = cordova.InAppBrowser.open(url, target, options);
-
-    inAppBrowserRef.addEventListener('loadstart', loadStartCallBack);
-
-    inAppBrowserRef.addEventListener('loadstop', loadStopCallBack);
-
-    inAppBrowserRef.addEventListener('loaderror', loadErrorCallBack);
-
-}
-
-function loadStartCallBack() {
-
-    $('#status-message').text("loading please wait ...");
-
-}
-
-function loadStopCallBack() {
-
-    if (inAppBrowserRef != undefined) {
-
-        inAppBrowserRef.insertCSS({ code: "body{font-size: 25px;" });
-
-        $('#status-message').text("");
-
-        inAppBrowserRef.show();
-    }
-
-}
-
-function loadErrorCallBack(params) {
-
-    $('#status-message').text("");
-
-    var scriptErrorMesssage =
-       "alert('Sorry we cannot open that page. Message from the server is : "
-       + params.message + "');"
-
-    inAppBrowserRef.executeScript({ code: scriptErrorMesssage }, executeScriptCallBack);
-
-    inAppBrowserRef.close();
-
-    inAppBrowserRef = undefined;
-
-}
-
-function executeScriptCallBack(params) {
-
-    if (params[0] == null) {
-
-        $('#status-message').text(
-           "Sorry we couldn't open that page. Message from the server is : '"
-           + params.message + "'");
-    }
-
-}
-
-```
-
 ### InAppBrowserEvent Properties

 - __type__: the eventname, either `loadstart`, `loadstop`, `loaderror`, or `exit`. _(String)_
@@ -337,9 +243,9 @@ function executeScriptCallBack(params) {
    var ref = cordova.InAppBrowser.open('http://apache.org', '_blank', 'location=yes');
    ref.addEventListener('loadstart', function(event) { alert(event.url); });

-## InAppBrowser.removeEventListener
+## removeEventListener

-> Removes a listener for an event from the `InAppBrowser`. (Only available when the target is set to `'_blank'`)
+> Removes a listener for an event from the `InAppBrowser`.

    ref.removeEventListener(eventname, callback);

@@ -371,7 +277,7 @@ The function is passed an `InAppBrowserEvent` object.
    ref.addEventListener('loadstart', myCallback);
    ref.removeEventListener('loadstart', myCallback);

-## InAppBrowser.close
+## close

 > Closes the `InAppBrowser` window.

@@ -394,7 +300,7 @@ The function is passed an `InAppBrowserEvent` object.
    var ref = cordova.InAppBrowser.open('http://apache.org', '_blank', 'location=yes');
    ref.close();

-## InAppBrowser.show
+## show

 > Displays an InAppBrowser window that was opened hidden. Calling this has no effect if the InAppBrowser was already visible.

@@ -416,30 +322,9 @@ The function is passed an `InAppBrowserEvent` object.
    // some time later...
    ref.show();

-## InAppBrowser.hide
+## executeScript

-> Hides the InAppBrowser window. Calling this has no effect if the InAppBrowser was already hidden.
-
-    ref.hide();
-
- __ref__: reference to the InAppBrowser window (`InAppBrowser`)
-
-### Supported Platforms
-
- Amazon Fire OS
- Android
- iOS
- Windows 8 and 8.1
-
-### Quick Example
-
-    var ref = cordova.InAppBrowser.open('http://apache.org', '_blank');
-    // some time later...
-    ref.hide();
-
-## InAppBrowser.executeScript
-
-> Injects JavaScript code into the `InAppBrowser` window. (Only available when the target is set to `'_blank'`)
+> Injects JavaScript code into the `InAppBrowser` window

    ref.executeScript(details, callback);

@@ -479,9 +364,9 @@ The function is passed an `InAppBrowserEvent` object.

 Due to [MSDN docs](https://msdn.microsoft.com/en-us/library/windows.ui.xaml.controls.webview.invokescriptasync.aspx) the invoked script can return only string values, otherwise the parameter, passed to __callback__ will be `[null]`.

-## InAppBrowser.insertCSS
+## insertCSS

-> Injects CSS into the `InAppBrowser` window. (Only available when the target is set to `'_blank'`)
+> Injects CSS into the `InAppBrowser` window.

    ref.insertCSS(details, callback);

@@ -506,204 +391,3 @@ Due to [MSDN docs](https://msdn.microsoft.com/en-us/library/windows.ui.xaml.cont
    ref.addEventListener('loadstop', function() {
        ref.insertCSS({file: "mystyles.css"});
    });
-__
-
-## <a id="sample"></a>Sample: Show help pages with an InAppBrowser
-
-You can use this plugin to show helpful documentation pages within your app. Users can view online help documents and then close them without leaving the app.
-
-Here's a few snippets that show how you do this.
-
-* [Give users a way to ask for help](#give).
-* [Load a help page](#load).
-* [Let users know that you're getting their page ready](#let).
-* [Show the help page](#show).
-* [Handle page errors](#handle).
-
-### <a id="give"></a>Give users a way to ask for help
-
-There's lots of ways to do this in your app. A drop down list is a simple way to do that.
-
-```html
-
-<select id="help-select">
-    <option value="default">Need help?</option>
-    <option value="article">Show me a helpful article</option>
-    <option value="video">Show me a helpful video</option>
-    <option value="search">Search for other topics</option>
-</select>
-
-```
-
-Gather the users choice in the ``onDeviceReady`` function of the page and then send an appropriate URL to a helper function in some shared library file. Our helper function is named ``showHelp()`` and we'll write that function next.
-
-```javascript
-
-$('#help-select').on('change', function (e) {
-
-    var url;
-
-    switch (this.value) {
-
-        case "article":
-            url = "https://cordova.apache.org/docs/en/latest/"
-                        + "reference/cordova-plugin-inappbrowser/index.html";
-            break;
-
-        case "video":
-            url = "https://youtu.be/F-GlVrTaeH0";
-            break;
-
-        case "search":
-            url = "https://www.google.com/#q=inAppBrowser+plugin";
-            break;
-    }
-
-    showHelp(url);
-
-});
-
-```
-
-### <a id="load"></a>Load a help page
-
-We'll use the ``open`` function to load the help page. We're setting the ``hidden`` property to ``yes`` so that we can show the browser only after the page content has loaded. That way, users don't see a blank browser while they wait for content to appear. When the ``loadstop`` event is raised, we'll know when the content has loaded. We'll handle that event shortly.
-
-```javascript
-
-function showHelp(url) {
-
-    var target = "_blank";
-
-    var options = "location=yes,hidden=yes";
-
-    inAppBrowserRef = cordova.InAppBrowser.open(url, target, options);
-
-    inAppBrowserRef.addEventListener('loadstart', loadStartCallBack);
-
-    inAppBrowserRef.addEventListener('loadstop', loadStopCallBack);
-
-    inAppBrowserRef.addEventListener('loaderror', loadErrorCallBack);
-
-}
-
-```
-
-### <a id="let"></a>Let users know that you're getting their page ready
-
-Because the browser doesn't immediately appear, we can use the ``loadstart`` event to show a status message, progress bar, or other indicator. This assures users that content is on the way.
-
-```javascript
-
-function loadStartCallBack() {
-
-    $('#status-message').text("loading please wait ...");
-
-}
-
-```
-
-### <a id="show"></a>Show the help page
-
-When the ``loadstopcallback`` event is raised, we know that the content has loaded and we can make the browser visible. This sort of trick can create the impression of better performance. The truth is that whether you show the browser before content loads or not, the load times are exactly the same.
-
-```javascript
-
-function loadStopCallBack() {
-
-    if (inAppBrowserRef != undefined) {
-
-        inAppBrowserRef.insertCSS({ code: "body{font-size: 25px;" });
-
-        $('#status-message').text("");
-
-        inAppBrowserRef.show();
-    }
-
-}
-
-```
-You might have noticed the call to the ``insertCSS`` function. This serves no particular purpose in our scenario. But it gives you an idea of why you might use it. In this case, we're just making sure that the font size of your pages have a certain size. You can use this function to insert any CSS style elements. You can even point to a CSS file in your project.
-
-### <a id="handle"></a>Handle page errors
-
-Sometimes a page no longer exists, a script error occurs, or a user lacks permission to view the resource. How or if you handle that situation is completely up to you and your design. You can let the browser show that message or you can present it in another way.
-
-We'll try to show that error in a message box. We can do that by injecting a script that calls the ``alert`` function. That said, this won't work in browsers on Windows devices so we'll have to look at the parameter of the ``executeScript`` callback function to see if our attempt worked. If it didn't work out for us, we'll just show the error message in a ``<div>`` on the page.
-
-```javascript
-
-function loadErrorCallBack(params) {
-
-    $('#status-message').text("");
-
-    var scriptErrorMesssage =
-       "alert('Sorry we cannot open that page. Message from the server is : "
-       + params.message + "');"
-
-    inAppBrowserRef.executeScript({ code: scriptErrorMesssage }, executeScriptCallBack);
-
-    inAppBrowserRef.close();
-
-    inAppBrowserRef = undefined;
-
-}
-
-function executeScriptCallBack(params) {
-
-    if (params[0] == null) {
-
-        $('#status-message').text(
-           "Sorry we couldn't open that page. Message from the server is : '"
-           + params.message + "'");
-    }
-
-}
-
-```
-
-## More Usage Info
-
-### Local Urls ( source is in the app package )
-```
-var iab = cordova.InAppBrowser;
-
-iab.open('local-url.html');                  // loads in the Cordova WebView
-iab.open('local-url.html', '_self');         // loads in the Cordova WebView
-iab.open('local-url.html', '_system');       // Security error: system browser, but url will not load (iOS)
-iab.open('local-url.html', '_blank');        // loads in the InAppBrowser
-iab.open('local-url.html', 'random_string'); // loads in the InAppBrowser
-iab.open('local-url.html', 'random_string', 'location=no'); // loads in the InAppBrowser, no location bar
-
-```
-
-
-
-### Whitelisted Content
-
-```
-var iab = cordova.InAppBrowser;
-
-iab.open('http://whitelisted-url.com');                  // loads in the Cordova WebView
-iab.open('http://whitelisted-url.com', '_self');         // loads in the Cordova WebView
-iab.open('http://whitelisted-url.com', '_system');       // loads in the system browser
-iab.open('http://whitelisted-url.com', '_blank');        // loads in the InAppBrowser
-iab.open('http://whitelisted-url.com', 'random_string'); // loads in the InAppBrowser
-
-iab.open('http://whitelisted-url.com', 'random_string', 'location=no'); // loads in the InAppBrowser, no location bar
-
-```
-
-### Urls that are not white-listed
-
-```
-var iab = cordova.InAppBrowser;
-
-iab.open('http://url-that-fails-whitelist.com');                  // loads in the InAppBrowser
-iab.open('http://url-that-fails-whitelist.com', '_self');         // loads in the InAppBrowser
-iab.open('http://url-that-fails-whitelist.com', '_system');       // loads in the system browser
-iab.open('http://url-that-fails-whitelist.com', '_blank');        // loads in the InAppBrowser
-iab.open('http://url-that-fails-whitelist.com', 'random_string'); // loads in the InAppBrowser
-iab.open('http://url-that-fails-whitelist.com', 'random_string', 'location=no'); // loads in the InAppBrowser, no location bar
-
-```
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,447 +20,20 @@
 -->
 # Release Notes

-### 1.7.1 (Apr 27, 2017)
-* [CB-12622](https://issues.apache.org/jira/browse/CB-12622) Added **Android 6.0** build badges to `README`
-* [CB-12266](https://issues.apache.org/jira/browse/CB-12266) (browser platform) loadstop event.url is now a string instead of an object, aligning it with the other platforms.
-* [CB-12685](https://issues.apache.org/jira/browse/CB-12685) added `package.json` to tests folder
-* [CB-11248](https://issues.apache.org/jira/browse/CB-11248) `InAppBrowser` no focus on input text fields
-
-### 1.7.0 (Feb 28, 2017)
-* [CB-12366](https://issues.apache.org/jira/browse/CB-12366) **iOS:** Reduce `tmpWindow` level to prevent overlapping statusbar
-* [CB-12364](https://issues.apache.org/jira/browse/CB-12364) **Windows:** `Inappbrowser` inject file manual tests are not working
-* [CB-12353](https://issues.apache.org/jira/browse/CB-12353) Corrected merges usage in `plugin.xml`
-* [CB-12369](https://issues.apache.org/jira/browse/CB-12369) Add plugin typings from `DefinitelyTyped`
-* [CB-12363](https://issues.apache.org/jira/browse/CB-12363) Added build badges for **iOS 9.3** and **iOS 10.0** 
-* [CB-9148](https://issues.apache.org/jira/browse/CB-9148) **Android:** Add Support for `input[type=file]` File Chooser
-* [CB-11136](https://issues.apache.org/jira/browse/CB-11136) (ios) Fix `InAppBrowser` when closing with `WKWebView`
-* [CB-10799](https://issues.apache.org/jira/browse/CB-10799) **iOS:** fix toolbar is shown in incorrect position when in-call status bar
-
-### 1.6.1 (Dec 14, 2016)
-* [CB-12237](https://issues.apache.org/jira/browse/CB-12237) - Update version in package.json to correct 1.6.1-dev
-* [CB-12236](https://issues.apache.org/jira/browse/CB-12236) - Fixed RELEASENOTES for cordova-plugin-inappbrowser
-* [CB-12230](https://issues.apache.org/jira/browse/CB-12230) Removed Windows 8.1 build badges
-* [CB-12224](https://issues.apache.org/jira/browse/CB-12224) Incremented plugin version.
-
-### 1.6.0 (Dec 07, 2016)
-* [CB-12224](https://issues.apache.org/jira/browse/CB-12224) Updated version and RELEASENOTES.md for release 1.6.0
-* [CB-7608](https://issues.apache.org/jira/browse/CB-7608) (android) document useWidthViewPort
-* add option useWidthViewPort
-* [CB-12184](https://issues.apache.org/jira/browse/CB-12184) executeScript leads to a null pointer on exception on Android.
-* fix(close button): Set correct content description
-* [CB-9274](https://issues.apache.org/jira/browse/CB-9274) Adds missing methods to InAppBrowser to allow compilation for Amazon FireOS.
-* [CB-10973](https://issues.apache.org/jira/browse/CB-10973) inAppBrowser for Windows Platform: wrong height of webview with location=yes
-* Increment plugin minor version because of new hide feature
-* removed duplicate hide method in ios source and add jasmine test cases
-* [CB-8467](https://issues.apache.org/jira/browse/CB-8467)
-* [CB-12010](https://issues.apache.org/jira/browse/CB-12010) (android) Catch FileUriExposedException
-* [CB-11955](https://issues.apache.org/jira/browse/CB-11955) Added Initial OSX platform support
-* [CB-11917](https://issues.apache.org/jira/browse/CB-11917) - Remove pull request template checklist item: "iCLA has been signed and submitted to secretary@apache.org."
-* [CB-11694](https://issues.apache.org/jira/browse/CB-11694) Android: Set hadwareBackButton value according option in cordova.InAppBrowser.open
-* [CB-11832](https://issues.apache.org/jira/browse/CB-11832) Incremented plugin version.
-
-### 1.5.1 (Dec 07, 2016)
-* [CB-7608](https://issues.apache.org/jira/browse/CB-7608) (android) document useWidthViewPort
-* add option useWidthViewPort
-* [CB-12184](https://issues.apache.org/jira/browse/CB-12184) executeScript leads to a null pointer on exception on Android.
-* fix(close button): Set correct content description
-* [CB-9274](https://issues.apache.org/jira/browse/CB-9274) Adds missing methods to InAppBrowser to allow compilation for Amazon FireOS.
-* [CB-10973](https://issues.apache.org/jira/browse/CB-10973) inAppBrowser for Windows Platform: wrong height of webview with location=yes
-* Increment plugin minor version because of new hide feature
-* removed duplicate hide method in ios source and add jasmine test cases
-* [CB-8467](https://issues.apache.org/jira/browse/CB-8467)
-* [CB-12010](https://issues.apache.org/jira/browse/CB-12010) (android) Catch FileUriExposedException
-* [CB-11955](https://issues.apache.org/jira/browse/CB-11955) Added Initial OSX platform support
-* [CB-11917](https://issues.apache.org/jira/browse/CB-11917) - Remove pull request template checklist item: "iCLA has been signed and submitted to secretary@apache.org."
-* [CB-11694](https://issues.apache.org/jira/browse/CB-11694) Android: Set hadwareBackButton value according option in cordova.InAppBrowser.open
-* [CB-11832](https://issues.apache.org/jira/browse/CB-11832) Incremented plugin version.
-* [CB-11832](https://issues.apache.org/jira/browse/CB-11832) Updated version and RELEASENOTES.md for release 1.5.0
-* [CB-11795](https://issues.apache.org/jira/browse/CB-11795) Add 'protective' entry to cordovaDependencies
-* Closing invalid pull request: close #28
-* Closing invalid pull request: close #78
-* Add intent scheme to be handled by OS
-* Plugin uses Android Log class and not Cordova LOG class
-* Adding links to guide content and reference content at the top of the readme file Github: close #163
-* [CB-10973](https://issues.apache.org/jira/browse/CB-10973) inAppBrowser for Browser Platform: wrong height of webview with location=yes
-* Size and position in browser platform
-* [CB-10973](https://issues.apache.org/jira/browse/CB-10973) inAppBrowser for Windows Platform: wrong height of webview with location=yes
-* [CB-11013](https://issues.apache.org/jira/browse/CB-11013) IAB enabling background play of YouTube videos?
-* [CB-10467](https://issues.apache.org/jira/browse/CB-10467) Hardware back button, while InAppBrowser is opened, closes the app too in addition to closing InAppBrowser
-* [CB-11178](https://issues.apache.org/jira/browse/CB-11178) allow to open other apps on iOS 9
-* Closing stale pull request: close #152
-* fix some calls which used api level 16
-* [CB-5402](https://issues.apache.org/jira/browse/CB-5402) added extra content from wiki page
-* doc: do not use `with` in JS samples
-* Closing stale pull request: close #90
-* [CB-2063](https://issues.apache.org/jira/browse/CB-2063) (ios) Fixed presentation style
-* [CB-11012](https://issues.apache.org/jira/browse/CB-11012) added some clarifications about InAppBrowser object
-* [CB-3360](https://issues.apache.org/jira/browse/CB-3360) Set custom inappbrowser user agent for ios
-* Add badges for paramedic builds on Jenkins
-* [CB-11381](https://issues.apache.org/jira/browse/CB-11381) android: Does not pass sonarqube scan
-* Add pull request template.
-* [CB-10866](https://issues.apache.org/jira/browse/CB-10866) Adding engine requirements to package.json
-* [CB-110003](https://issues.apache.org/jira/browse/CB-110003) Adding samples to Readme.
-* [CB-10996](https://issues.apache.org/jira/browse/CB-10996) Adding front matter to README.md
-* [CB-11091](https://issues.apache.org/jira/browse/CB-11091) Incremented plugin version.
-*  Updated version and RELEASENOTES.md for release 1.4.0
-* [CB-7679](https://issues.apache.org/jira/browse/CB-7679) add fix for iOS upload. This closes #139
-* [CB-10944](https://issues.apache.org/jira/browse/CB-10944) : NoSuchMethodError in InAppBrowser plugin
-* [CB-10937](https://issues.apache.org/jira/browse/CB-10937) fix stretched icons
-* [CB-10760](https://issues.apache.org/jira/browse/CB-10760) Fixing README for display on Cordova website
-* [CB-10636](https://issues.apache.org/jira/browse/CB-10636) Add JSHint for plugins
-* Fixes [CB-10607](https://issues.apache.org/jira/browse/CB-10607)
-* [CB-10557](https://issues.apache.org/jira/browse/CB-10557) Incremented plugin version.
-* [CB-10557](https://issues.apache.org/jira/browse/CB-10557) Updated version and RELEASENOTES.md for release 1.3.0
-* [CB-3360](https://issues.apache.org/jira/browse/CB-3360) Set custom inappbrowser user agent for android
-* [CB-10538](https://issues.apache.org/jira/browse/CB-10538) cordova-plugin-inappbrowser timeout issue
-* [CB-10395](https://issues.apache.org/jira/browse/CB-10395) InAppBrowser's WebView not storing cookies reliable on Android
-* chore: edit package.json license to match SPDX id
-* [CB-10305](https://issues.apache.org/jira/browse/CB-10305) Gray bar appears in the wrong place on iOS
-* [CB-7786](https://issues.apache.org/jira/browse/CB-7786) Support mediaPlaybackRequiresUserAction on Android
-* [CB-7500](https://issues.apache.org/jira/browse/CB-7500) executeScript with callback kills/blurs inAppBrowser window on Android
-* [CB-10505](https://issues.apache.org/jira/browse/CB-10505) Incremented plugin version.
-* [CB-10505](https://issues.apache.org/jira/browse/CB-10505) Updated version and RELEASENOTES.md for release 1.2.1
-* handle app store urls in system browser
-* Added missing plugin dependency for manual tests
-* [CB-10451](https://issues.apache.org/jira/browse/CB-10451) InAppBrowser: loadstart event is not triggered on Windows [CB-10452](https://issues.apache.org/jira/browse/CB-10452) InAppBrowser: 'exit' event is not triggered on Windows [CB-10454](https://issues.apache.org/jira/browse/CB-10454) InAppBrowser: 'loaderror' event does not have code and message on Windows [CB-10450](https://issues.apache.org/jira/browse/CB-10450) InAppBrowser: Unable to get property 'canGoBack' of undefined on Windows
-* [CB-6702](https://issues.apache.org/jira/browse/CB-6702) InAppBrowser hangs when opening more than one instance
-* [CB-10456](https://issues.apache.org/jira/browse/CB-10456) InAppBrowser is not closed if I close it programmatically on Android
-* [CB-10441](https://issues.apache.org/jira/browse/CB-10441) Add auto tests for InAppBrowser plugin
-* [CB-10428](https://issues.apache.org/jira/browse/CB-10428) Fix syntax error when browserifying inAppBrowser plugin
-* [CB-10407](https://issues.apache.org/jira/browse/CB-10407) Re-adding onPageStarted to re-add LOAD_START, even though it's in the wrong place
-* [CB-10368](https://issues.apache.org/jira/browse/CB-10368) Incremented plugin version.
-* [CB-10368](https://issues.apache.org/jira/browse/CB-10368) Updated version and RELEASENOTES.md for release 1.2.0
-* [CB-8180](https://issues.apache.org/jira/browse/CB-8180) Changing methods of interception in WebViewClient class
-* Fix lint warnings
-* [CB-10009](https://issues.apache.org/jira/browse/CB-10009) Improve InAppBrowser toolbar look and feel on Windows
-* Using modulemapper
-* Open a new window on the browser platform
-* [CB-10187](https://issues.apache.org/jira/browse/CB-10187) Incremented plugin version.
-* [CB-10187](https://issues.apache.org/jira/browse/CB-10187) Updated version and RELEASENOTES.md for release 1.1.1
-* [CB-9445](https://issues.apache.org/jira/browse/CB-9445) Improves executeScript callbacks on iOS
-* [CB-10035](https://issues.apache.org/jira/browse/CB-10035) Incremented plugin version.
-* [CB-10040](https://issues.apache.org/jira/browse/CB-10040) - re-fix: backwards compatible with cordova-ios < 4.0
-* [CB-8534](https://issues.apache.org/jira/browse/CB-8534) Allow plugins to respond to onReceivedHttpAuthRequest. This closes #82
-* [CB-3750](https://issues.apache.org/jira/browse/CB-3750) Fixes spinner on iOS. This closes #89
-* [CB-7696](https://issues.apache.org/jira/browse/CB-7696) Document target=_self behavior for Windows
-* [CB-10040](https://issues.apache.org/jira/browse/CB-10040) - Compile Error in InAppBrowser Plugin for iOS - No known instance method for selector 'URLIsWhitelisted:'
-* [CB-10035](https://issues.apache.org/jira/browse/CB-10035) linked issues in RELEASENOTES.md
-* [CB-10035](https://issues.apache.org/jira/browse/CB-10035) Updated version and RELEASENOTES.md for release 1.1.0
-* removed r prefix from tags
-* weak ref type was wrong
-* [CB-10035](https://issues.apache.org/jira/browse/CB-10035) Updated RELEASENOTES to be newest to oldest
-* Close #91
-* Close #85
-* Invoke webview if using local file
-* Fixed zIndex issue on Windows 8, 8.1 where InAppBrowser opens behind default app.
-* fix async self usage
-* [CB-9150](https://issues.apache.org/jira/browse/CB-9150) Fix InAppBrowser executeScript crash on Windows if no data returned
-* [CB-10008](https://issues.apache.org/jira/browse/CB-10008) Fix InAppBrowser popup layout on Windows
-* InAppBrowser, iOS: Setting setStatusBarStyle to -1 causes CGContextSaveGState.
-* Fix crash on browser window close (https://issues.apache.org/jira/browse/CB-9167)
-* Close #113
-* add JIRA issue tracker link
-* [CB-9799](https://issues.apache.org/jira/browse/CB-9799) Fixed javaDoc errors.. This closes #119
-* Actually fixing the contribute link.
-* Fixing contribute link.
-* [CB-9760](https://issues.apache.org/jira/browse/CB-9760) InAppBrowser: fallback to default window.open behavior on Ripple
-* Close #114
-* [CB-9378](https://issues.apache.org/jira/browse/CB-9378) Fix InAppBrowser not taking whole screen on Windows
-* remove travis-ci
-* [CB-9158](https://issues.apache.org/jira/browse/CB-9158) - InAppBrowser zoomControls are always set to true
-* [CB-9192](https://issues.apache.org/jira/browse/CB-9192) Incremented plugin version.
-* [CB-9202](https://issues.apache.org/jira/browse/CB-9202) updated repo url to github mirror in package.json
-* [CB-9192](https://issues.apache.org/jira/browse/CB-9192) Updated version and RELEASENOTES.md for release 1.0.1
-* [CB-9128](https://issues.apache.org/jira/browse/CB-9128) cordova-plugin-inappbrowser documentation translation: cordova-plugin-inappbrowser
-* fix npm md issue
-* [CB-8858](https://issues.apache.org/jira/browse/CB-8858) Incremented plugin version.
-* [CB-8858](https://issues.apache.org/jira/browse/CB-8858) Updated version in package.json for release 1.0.0
-* Revert "CB-8858 Incremented plugin version."
-* [CB-8858](https://issues.apache.org/jira/browse/CB-8858) Incremented plugin version.
-* [CB-8858](https://issues.apache.org/jira/browse/CB-8858) Updated version and RELEASENOTES.md for release 1.0.0
-* [CB-8746](https://issues.apache.org/jira/browse/CB-8746) gave plugin major version bump
-* [CB-7689](https://issues.apache.org/jira/browse/CB-7689) Adds insertCSS support for windows platform
-* [CB-4930](https://issues.apache.org/jira/browse/CB-4930) - (prefix) InAppBrowser should take into account the status bar
-* [CB-8635](https://issues.apache.org/jira/browse/CB-8635) Improves UX on windows platform
-* [CB-8661](https://issues.apache.org/jira/browse/CB-8661) Return executed script result on Windows
-* [CB-8683](https://issues.apache.org/jira/browse/CB-8683) updated wp and browser specific references of old id to new id
-* [CB-8683](https://issues.apache.org/jira/browse/CB-8683) changed plugin-id to pacakge-name
-* [CB-8653](https://issues.apache.org/jira/browse/CB-8653) properly updated translated docs to use new id
-* [CB-8653](https://issues.apache.org/jira/browse/CB-8653) updated translated docs to use new id
-* Use TRAVIS_BUILD_DIR, install paramedic by npm
-* [CB-8432](https://issues.apache.org/jira/browse/CB-8432) Correct styles for browser wrapper to display it correctly on some pages
-* [CB-8659](https://issues.apache.org/jira/browse/CB-8659) - Update InAppBrowser to support both cordova-ios 4.0.x and 3.x (closes #93)
-* [CB-7961](https://issues.apache.org/jira/browse/CB-7961) Add cordova-plugin-inappbrowser support for browser platform
-* [CB-8653](https://issues.apache.org/jira/browse/CB-8653) Updated Readme
-* Update docs for Android zoom=no option
-* Added option to disable/enable zoom controls
-* updated docs, set hardwareback default to true
-* Add a hardwareback option to allow for the hardware back button to go back.
-* [CB-8570](https://issues.apache.org/jira/browse/CB-8570) Integrate TravisCI
-* [CB-8438](https://issues.apache.org/jira/browse/CB-8438) cordova-plugin-inappbrowser documentation translation: cordova-plugin-inappbrowser
-* [CB-8538](https://issues.apache.org/jira/browse/CB-8538) Added package.json file
-* Keep external android pages in a single tab. (close #61)
-* [CB-8444](https://issues.apache.org/jira/browse/CB-8444) Add a clobber for `cordova.InAppBrowser.open` (close #80)
-* [CB-8444](https://issues.apache.org/jira/browse/CB-8444) Don't clobber `window.open` - Add new symbol/clobber to access open function (`cordova.InAppBrowser.open`) - Change existing tests to use new symbol (i.e. don't rely on plugin clobber of `window.open`) - Add tests to use `window.open` via manual replace with new symbol - Update docs to deprecate plugin clobber of `window.open`
-* [CB-8429](https://issues.apache.org/jira/browse/CB-8429) Incremented plugin version.
-* [CB-8429](https://issues.apache.org/jira/browse/CB-8429) Updated version and RELEASENOTES.md for release 0.6.0
-* Add missing license header for src/ubuntu/InAppBrowser_escapeScript.js
-* [CB-8270](https://issues.apache.org/jira/browse/CB-8270) Remove usage of `[arr JSONString]`, since it's been renamed to `cdv_JSONString`
-* ubuntu: implement inject* functions
-* ubuntu: port to oxide
-* [CB-7897](https://issues.apache.org/jira/browse/CB-7897) Update to work with whilelist plugins in Cordova 4.x
-* [CB-7897](https://issues.apache.org/jira/browse/CB-7897) Update to work with whilelist plugins in Cordova 4.x
-* [CB-8110](https://issues.apache.org/jira/browse/CB-8110) Incremented plugin version.
-* [CB-8110](https://issues.apache.org/jira/browse/CB-8110) Updated version and RELEASENOTES.md for release 0.5.4
-* Amazon specific changes: Removed reference to closebuttoncaption according to https://git-wip-us.apache.org/repos/asf?p=cordova-plugin-inappbrowser.git;a=commit;h=50a78baf22843b0df96ccb4ca83a45bd9ef3fc39
-* [CB-7784](https://issues.apache.org/jira/browse/CB-7784) Exit event is not fired after InAppBrowser closing
-* [CB-7697](https://issues.apache.org/jira/browse/CB-7697) Add locationBar support to InAppBrowser windows platform version
-* [CB-7690](https://issues.apache.org/jira/browse/CB-7690) InAppBrowser loadstart/loadstop events issues
-* [CB-7695](https://issues.apache.org/jira/browse/CB-7695) Fix InAppBrowser injectScriptFile for Windows 8.1 / Windows Phone 8.1
-* [CB-7692](https://issues.apache.org/jira/browse/CB-7692) InAppBrowser local url opening bug in 8.1
-* [CB-7688](https://issues.apache.org/jira/browse/CB-7688) Alert is not supported in InAppBrowser on Windows platform
-* [CB-7977](https://issues.apache.org/jira/browse/CB-7977) Mention deviceready in plugin docs
-* Dropping trailing whitespace
-* [CB-7876](https://issues.apache.org/jira/browse/CB-7876) change test target to avoid undesired redirects
-* [CB-7712](https://issues.apache.org/jira/browse/CB-7712) remove references to closebuttoncaption
-* [CB-7850](https://issues.apache.org/jira/browse/CB-7850) clarify role of whitelist
-* [CB-7720](https://issues.apache.org/jira/browse/CB-7720) check if event is null since OK string from success callback was removed
-* [CB-7700](https://issues.apache.org/jira/browse/CB-7700) cordova-plugin-inappbrowser documentation translation: cordova-plugin-inappbrowser
-* [CB-7471](https://issues.apache.org/jira/browse/CB-7471) cordova-plugin-inappbrowser documentation translation: cordova-plugin-inappbrowser
-*  Incremented plugin version.
-*  Updated version and RELEASENOTES.md for release 0.5.3
-* Amazon Specific changes: Added logs and corrected indentation according to 81161ebe668a14f87e1ef4b57f2d300a609b9a8b
-* Windows implementation fixes and improvements
-* zIndex fixed
-* renamed InAppBrowser back to inappbrowser for case sensitive operating systems
-* Clean plugin.xml
-* Update french translation
-* Update doc to add Windows 8
-* Update windows proxy to be both compatible with windows 8 and 8.1
-* Rename windows81 by windows8 in src directory
-* Append Windows 8.1 platform configuration in plugin.xml
-* Append Windows 8.1 proxy using x-ms-webview
-* [CB-7571](https://issues.apache.org/jira/browse/CB-7571) Bump version of nested plugin to match parent plugin
-* [CB-7571](https://issues.apache.org/jira/browse/CB-7571) Incremented plugin version.
-* [CB-7571](https://issues.apache.org/jira/browse/CB-7571) Updated version and RELEASENOTES.md for release 0.5.2
-* [CB-7471](https://issues.apache.org/jira/browse/CB-7471) cordova-plugin-inappbrowser documentation translation: cordova-plugin-inappbrowser
-* [CB-7490](https://issues.apache.org/jira/browse/CB-7490) Fixes InAppBrowser manual tests crash on windows platform
-* [CB-7249](https://issues.apache.org/jira/browse/CB-7249) cordova-plugin-inappbrowser documentation translation: cordova-plugin-inappbrowser
-* [CB-7424](https://issues.apache.org/jira/browse/CB-7424) - Wrong docs: anchor tags are not supported by the InAppBrowser
-* [CB-7133](https://issues.apache.org/jira/browse/CB-7133) clarify that anchor1 doesn't exist
-* [CB-7133](https://issues.apache.org/jira/browse/CB-7133) more fixup of tests on Android
-* [CB-7133](https://issues.apache.org/jira/browse/CB-7133) fix up the tests for Android
-* Add just a bit more logging
-* [CB-7133](https://issues.apache.org/jira/browse/CB-7133) port inappbrowser to plugin-test-framework
-* phonegap events supported for _blank target
-* inappbrowser _blank target position is fixed
-* amazon-fireos related changes.
-* [CB-7244](https://issues.apache.org/jira/browse/CB-7244) Incremented plugin version.
-* [CB-7244](https://issues.apache.org/jira/browse/CB-7244) Updated version and RELEASENOTES.md for release 0.5.1
-* ubuntu: support qt 5.2
-* CB-7249cordova-plugin-inappbrowser documentation translation: cordova-plugin-inappbrowser
-* update InAppBrowserProxy.js
-* app needs to be privileged
-* CB-6127lisa7cordova-plugin-consolecordova-plugin-inappbrowser documentation translation: cordova-plugin-inappbrowser
-* [CB-6769](https://issues.apache.org/jira/browse/CB-6769) ios: Fix statusbar color reset wasn't working on iOS7+
-* [CB-6877](https://issues.apache.org/jira/browse/CB-6877) Incremented plugin version.
-* [CB-6877](https://issues.apache.org/jira/browse/CB-6877) Updated version and RELEASENOTES.md for release 0.5.0
-* [CB-6127](https://issues.apache.org/jira/browse/CB-6127) Spanish and rench Translations added. Github close #23
-* Clean up whitespace (mainly due to no newline at eof warning)
-* after code review
-* default parameter added
-* doc updated
-* console.log removed
-* back/forward buttons added, iframe has no border
-* not forcing the look of the inAppBrowserWrap and buttons
-* Adding permission info
-* [CB-6806](https://issues.apache.org/jira/browse/CB-6806) Add license
-* documentation translation: cordova-plugin-inappbrowser
-* Lisa testing pulling in plugins for plugin: cordova-plugin-inappbrowser
-* Lisa testing pulling in plugins for plugin: cordova-plugin-inappbrowser
-* [CB-6491](https://issues.apache.org/jira/browse/CB-6491) add CONTRIBUTING.md
-* Add necessary capability so the plugin works on its own
-* [CB-6474](https://issues.apache.org/jira/browse/CB-6474) InAppBrowser. Add data urls support to WP8
-* [CB-6482](https://issues.apache.org/jira/browse/CB-6482) InAppBrowser calls incorrect callback on WP8
-* Fixed use of iOS 6 deprecated methods
-* [CB-6360](https://issues.apache.org/jira/browse/CB-6360) - improvement: feature detection instead of iOS version detection
-* [CB-5649](https://issues.apache.org/jira/browse/CB-5649) - InAppBrowser overrides App's orientation
-* [CB-6452](https://issues.apache.org/jira/browse/CB-6452) Incremented plugin version on dev branch.
-* [CB-6452](https://issues.apache.org/jira/browse/CB-6452) Updated version and RELEASENOTES.md for release 0.4.0
-* [CB-6460](https://issues.apache.org/jira/browse/CB-6460) Update license headers
-* [CB-6360](https://issues.apache.org/jira/browse/CB-6360) Fix for crash on iOS < 6.0 (closes #37)
-* [CB-3324](https://issues.apache.org/jira/browse/CB-3324) Add support for back-button inappbrowser [WP8] if there is no history -> InAppBrowser is closed
-* await async calls, resolve warnings
-* Make InAppBrowser work with embedded files, using system behavior
-* [CB-6402](https://issues.apache.org/jira/browse/CB-6402) [WP8] pass empty string instead of null for [optional] windowFeatures string
-* [CB-6422](https://issues.apache.org/jira/browse/CB-6422) [windows8] use cordova/exec/proxy
-* [CB-3617](https://issues.apache.org/jira/browse/CB-3617) Document clearcache and clearsessioncache for ios
-* [CB-6389](https://issues.apache.org/jira/browse/CB-6389) [CB-3617](https://issues.apache.org/jira/browse/CB-3617) Add clearcache and clearsessioncache options to iOS (like Android)
-* refactoring fixed
-* [CB-6396](https://issues.apache.org/jira/browse/CB-6396) [Firefox OS] Adding basic support
-* Doc update: event name and example param (closes #31)
-* [CB-6253](https://issues.apache.org/jira/browse/CB-6253) Add Network Capability to WMAppManifest.xml
-* [CB-6212](https://issues.apache.org/jira/browse/CB-6212) iOS: fix warnings compiled under arm64 64-bit
-* [CB-6218](https://issues.apache.org/jira/browse/CB-6218) Update docs for BB10
-* Tweak RELEASENOTES.md (missed a bug fix in last release)
-* Incremented plugin version on dev branch.
-* [CB-6218](https://issues.apache.org/jira/browse/CB-6218) Update docs for BB10
-* Updated version and RELEASENOTES.md for release 0.3.3
-* [CB-6172](https://issues.apache.org/jira/browse/CB-6172) Fix inappbrowser install failure on case-sensitive filesystems.
-* [CB-5534](https://issues.apache.org/jira/browse/CB-5534) Updating the plugin.xml with the new Dialog class
-* fix for [CB-5534](https://issues.apache.org/jira/browse/CB-5534)
-* Add NOTICE file
-* [CB-6114](https://issues.apache.org/jira/browse/CB-6114) Incremented plugin version on dev branch.
-* Add NOTICE file
-* [CB-6114](https://issues.apache.org/jira/browse/CB-6114) Updated version and RELEASENOTES.md for release 0.3.2
-* Validate that callbackId is correctly formed
-* [CB-6035](https://issues.apache.org/jira/browse/CB-6035) - Move js-module so it is not loaded on unsupported platforms
-* [CB-5980](https://issues.apache.org/jira/browse/CB-5980) Incremented plugin version on dev branch.
-* [CB-5980](https://issues.apache.org/jira/browse/CB-5980) Updated version and RELEASENOTES.md for release 0.3.1
-* Removed some iOS6 Deprecations
-* Lisa testing pulling in plugins for plugin: cordova-plugin-inappbrowser
-* Lisa testing pulling in plugins for plugin: cordova-plugin-inappbrowser
-* [CB-5980](https://issues.apache.org/jira/browse/CB-5980) Updated version and RELEASENOTES.md for release 0.3.1
-* Add missing import for previous commit
-* [CB-5756](https://issues.apache.org/jira/browse/CB-5756) Android: Use WebView.evaluateJavascript for script injection on Android 4.4+
-* Didn't test on ICS or lower, getDrawable isn't supported until Jellybean
-* WTF? ubuntu got automerged twice
-* add ubuntu platform
-* Adding CC-A-2.5 Notice for Assets, modifying plugins to use resources
-* Adding the buttons
-* Adding drawables to the inAppBrowser.  This doesn't look quite right, but it's a HUGE improvement over the previous settings
-* [CB-5756](https://issues.apache.org/jira/browse/CB-5756) Add missing import
-* [CB-5756](https://issues.apache.org/jira/browse/CB-5756) Android: Use WebView.evaluateJavascript for script injection on Android 4.4+
-* Delete stale test/ directory
-* Remove _alive from InAppBrowser.js since it didn't catch the case where the browser is closed by the user.
-* [CB-5733](https://issues.apache.org/jira/browse/CB-5733) Fix IAB.close() not working if called before show() animation is done
-* [CB-5719](https://issues.apache.org/jira/browse/CB-5719) Incremented plugin version on dev branch.
-* [CB-5719](https://issues.apache.org/jira/browse/CB-5719) Updated version and RELEASENOTES.md for release 0.3.0
-* [CB-5592](https://issues.apache.org/jira/browse/CB-5592) Add a comment explaining why we set MIME only for file:
-* [CB-5592](https://issues.apache.org/jira/browse/CB-5592) Android - Add MIME type to Intent when opening file:/// URLs
-* [CB-5658](https://issues.apache.org/jira/browse/CB-5658) Update license comment formatting of doc/index.md
-* [CB-5658](https://issues.apache.org/jira/browse/CB-5658) Add doc.index.md for InAppBrowser plugin
-* [CB-5658](https://issues.apache.org/jira/browse/CB-5658) Delete stale snapshot of plugin docs
-* [CB-5594](https://issues.apache.org/jira/browse/CB-5594) Add disallowoverscroll option.
-* [CB-5595](https://issues.apache.org/jira/browse/CB-5595) Rename "toolbarbarpostion" -> "toolbarposition"
-* [CB-5595](https://issues.apache.org/jira/browse/CB-5595) Fixed the positioning and autoresizing for certain rotation scenarios.
-* [CB-5595](https://issues.apache.org/jira/browse/CB-5595) Add toolbarposition=top option.
-* Apply [CB-5193](https://issues.apache.org/jira/browse/CB-5193) to InAppBrowser
-* [CB-5593](https://issues.apache.org/jira/browse/CB-5593) iOS: Make InAppBrowser localizable
-* [CB-5591](https://issues.apache.org/jira/browse/CB-5591) Change window.escape to encodeURIComponent
-* [CB-5565](https://issues.apache.org/jira/browse/CB-5565) Incremented plugin version on dev branch.
-* [CB-5565](https://issues.apache.org/jira/browse/CB-5565) Updated version and RELEASENOTES.md for release 0.2.5
-* Remove merge conflict tag
-* [CB-4724](https://issues.apache.org/jira/browse/CB-4724) fixed UriFormatException
-* add ubuntu platform
-* [CB-3420](https://issues.apache.org/jira/browse/CB-3420) WP feature hidden=yes implemented
-* Added amazon-fireos platform. Change to use amazon-fireos as the platform if user agent string contains 'cordova-amazon-fireos'
-* [CB-5188](https://issues.apache.org/jira/browse/CB-5188)
-* [CB-5188](https://issues.apache.org/jira/browse/CB-5188) Updated version and RELEASENOTES.md for release 0.2.4
-* [CB-5128](https://issues.apache.org/jira/browse/CB-5128) added repo + issue tag to plugin.xml for inappbrowser plugin
-* [CB-4995](https://issues.apache.org/jira/browse/CB-4995) Fix crash when WebView is quickly opened then closed.
-* [CB-4930](https://issues.apache.org/jira/browse/CB-4930) - iOS - InAppBrowser should take into account the status bar
-* [CB-5010](https://issues.apache.org/jira/browse/CB-5010) Incremented plugin version on dev branch.
-* [CB-5010](https://issues.apache.org/jira/browse/CB-5010) Updated version and RELEASENOTES.md for release 0.2.3
-* [CB-4858](https://issues.apache.org/jira/browse/CB-4858) - Run IAB methods on the UI thread.
-* [CB-4858](https://issues.apache.org/jira/browse/CB-4858) Convert relative URLs to absolute URLs in JS
-* [CB-3747](https://issues.apache.org/jira/browse/CB-3747) Fix back button having different dismiss logic from the close button.
-* [CB-5021](https://issues.apache.org/jira/browse/CB-5021) Expose closeDialog() as a public function and make it safe to call multiple times.
-* [CB-5021](https://issues.apache.org/jira/browse/CB-5021) Make it safe to call close() multiple times
-* [CB-5010](https://issues.apache.org/jira/browse/CB-5010) Updated version and RELEASENOTES.md for release 0.2.3
-* [CB-4915](https://issues.apache.org/jira/browse/CB-4915) Incremented plugin version on dev branch.
-* [CB-4926](https://issues.apache.org/jira/browse/CB-4926) Fixes inappbrowser plugin loading for windows8
-* [CB-4915](https://issues.apache.org/jira/browse/CB-4915) Updated version and RELEASENOTES.md for release 0.2.2
-* [CB-4889](https://issues.apache.org/jira/browse/CB-4889) bumping&resetting version
-* [CB-4788](https://issues.apache.org/jira/browse/CB-4788) Modified the onJsPrompt to warn against Cordova calls
-* [windows8] commandProxy was moved
-* [CB-4788](https://issues.apache.org/jira/browse/CB-4788) Modified the onJsPrompt to warn against Cordova calls
-* [windows8] commandProxy was moved
-* [CB-4889](https://issues.apache.org/jira/browse/CB-4889) renaming core references
-* [CB-4889](https://issues.apache.org/jira/browse/CB-4889) renaming org.apache.cordova.core.inappbrowser to org.apache.cordova.inappbrowser
-* CB-4864, [CB-4865](https://issues.apache.org/jira/browse/CB-4865) Minor improvements to InAppBrowser
-* Rename CHANGELOG.md -> RELEASENOTES.md
-* [CB-4792](https://issues.apache.org/jira/browse/CB-4792) Added keepCallback to the show function.
-* [CB-4752](https://issues.apache.org/jira/browse/CB-4752) Incremented plugin version on dev branch.
-* Add empty CHANGELOG.md
-* [CB-4586](https://issues.apache.org/jira/browse/CB-4586) Making loadUrl run on the UI thread for close dialog to stop the WebView error
-* [Windows8] add support for Windows 8 ( limited )
-* [CB-3616](https://issues.apache.org/jira/browse/CB-3616) Change option name to "clearcache" to match original proposal
-* add "clearallcache" and "clearsessioncache" option to InAppbrowser
-* [CB-4595](https://issues.apache.org/jira/browse/CB-4595) updated version
-* [CB-4417](https://issues.apache.org/jira/browse/CB-4417) Move cordova-plugin-inappbrowser to its own Java package.
-* updated Readme, namespace and name tag
-* [plugin.xml] standardizing license + meta
-* [license] adding apache license file
-* [CB-4399](https://issues.apache.org/jira/browse/CB-4399) removed blackberry entry in plugin xml. Installation of plugin interferes with natively supported childbrowser functionality. To support additional inappbrowser features, see [CB-4467.](https://issues.apache.org/jira/browse/CB-4467.)
-* updating plugin.xml with registry data
-* [CB-4368](https://issues.apache.org/jira/browse/CB-4368) Explicit CoreGraphics.framework dependency should be specified for some core plugins
-
-### 1.5.0 (Sep 08, 2016)
-* [CB-11795](https://issues.apache.org/jira/browse/CB-11795) Add 'protective' entry to cordovaDependencies
-* Add intent scheme to be handled by OS
-* Plugin uses `Android Log class` and not `Cordova LOG class`
-* Adding links to guide content and reference content at the top of the readme file Github: close #163
-* [CB-10973](https://issues.apache.org/jira/browse/CB-10973) **Browser**: wrong height of webview with `location=yes`
-* Size and position in browser platform
-* [CB-10973](https://issues.apache.org/jira/browse/CB-10973) **Windows**: wrong height of webview with `location=yes`
-* [CB-11013](https://issues.apache.org/jira/browse/CB-11013) IAB enabling background play of YouTube videos?
-* [CB-10467](https://issues.apache.org/jira/browse/CB-10467) Hardware back button, while `InAppBrowser` is opened, closes the app too in addition to closing `InAppBrowser`
-* [CB-11178](https://issues.apache.org/jira/browse/CB-11178) allow to open other apps on **iOS 9**
-* fix some calls which used api level 16
-* [CB-5402](https://issues.apache.org/jira/browse/CB-5402) added extra content from wiki page
-* [CB-2063](https://issues.apache.org/jira/browse/CB-2063) (**ios**) Fixed presentation style
-* [CB-11012](https://issues.apache.org/jira/browse/CB-11012) added some clarifications about `InAppBrowser` object
-* [CB-3360](https://issues.apache.org/jira/browse/CB-3360) Set custom `inappbrowser` user agent for **ios**
-* Add badges for paramedic builds on Jenkins
-* [CB-11381](https://issues.apache.org/jira/browse/CB-11381) android: Does not pass sonarqube scan
-* Add pull request template.
-* [CB-10866](https://issues.apache.org/jira/browse/CB-10866) Adding engine requirements to `package.json`
-* [CB-110003](https://issues.apache.org/jira/browse/CB-110003) Adding samples to Readme.
-* [CB-10996](https://issues.apache.org/jira/browse/CB-10996) Adding front matter to README.md
-
-### 1.4.0 (Apr 15, 2016)
-* [CB-7679](https://issues.apache.org/jira/browse/CB-7679) add fix for **iOS** upload.
-* [CB-10944](https://issues.apache.org/jira/browse/CB-10944) `NoSuchMethodError` in `InAppBrowser` plugin
-* [CB-10937](https://issues.apache.org/jira/browse/CB-10937) fix stretched icons
-* [CB-10760](https://issues.apache.org/jira/browse/CB-10760) Fixing README for display on Cordova website
-* [CB-10636](https://issues.apache.org/jira/browse/CB-10636) Add `JSHint` for plugins
-
-### 1.3.0 (Feb 09, 2016)
-* [CB-3360](https://issues.apache.org/jira/browse/CB-3360) Set custom inappbrowser user agent for android
-* [CB-10538](https://issues.apache.org/jira/browse/CB-10538) cordova-plugin-inappbrowser timeout issue
-* [CB-10395](https://issues.apache.org/jira/browse/CB-10395) InAppBrowser's WebView not storing cookies reliable on Android
-* Edit package.json license to match SPDX id
-* [CB-10305](https://issues.apache.org/jira/browse/CB-10305) Gray bar appears in the wrong place on iOS
-* [CB-7786](https://issues.apache.org/jira/browse/CB-7786) Support mediaPlaybackRequiresUserAction on Android
-* [CB-7500](https://issues.apache.org/jira/browse/CB-7500) executeScript with callback kills/blurs inAppBrowser window on Android
-
-### 1.2.1 (Feb 02, 2016)
-* [CB-10407](https://issues.apache.org/jira/browse/CB-10407) InAppBrowser not firing loadstart event on android
-* [CB-10428](https://issues.apache.org/jira/browse/CB-10428) Fix syntax error when browserifying inAppBrowser plugin
-* handle app store urls in system browser
-* [CB-6702](https://issues.apache.org/jira/browse/CB-6702) InAppBrowser hangs when opening more than one instance
-* [CB-10456](https://issues.apache.org/jira/browse/CB-10456) InAppBrowser is not closed if I close it programmatically on Android
-* [CB-10451](https://issues.apache.org/jira/browse/CB-10451) InAppBrowser: loadstart event is not triggered on Windows
-* [CB-10452](https://issues.apache.org/jira/browse/CB-10452) InAppBrowser: 'exit' event is not triggered on Windows
-* [CB-10454](https://issues.apache.org/jira/browse/CB-10454) InAppBrowser: 'loaderror' event does not have code and message on Windows
-* [CB-10450](https://issues.apache.org/jira/browse/CB-10450) InAppBrowser: Unable to get property 'canGoBack' of undefined on Windows
-* [CB-10441](https://issues.apache.org/jira/browse/CB-10441) Add auto tests for InAppBrowser plugin
-
 ### 1.2.0 (Jan 15, 2016)
-* [CB-8180](https://issues.apache.org/jira/browse/CB-8180) Changing methods of interception in `WebViewClient` class
-* [CB-10009](https://issues.apache.org/jira/browse/CB-10009) Improve `InAppBrowser` toolbar look and feel on **Windows**
+* CB-8180: Changing methods of interception in `WebViewClient` class
+* CB-10009 Improve `InAppBrowser` toolbar look and feel on **Windows**
 * Open a new window on the **Browser** platform

 ### 1.1.1 (Dec 10, 2015)

-* [CB-9445](https://issues.apache.org/jira/browse/CB-9445) Improves executeScript callbacks on iOS
-* [CB-10035](https://issues.apache.org/jira/browse/CB-10035) Incremented plugin version.
-* [CB-10040](https://issues.apache.org/jira/browse/CB-10040) - re-fix: backwards compatible with cordova-ios < 4.0
-* [CB-8534](https://issues.apache.org/jira/browse/CB-8534) Allow plugins to respond to onReceivedHttpAuthRequest. This closes #82
-* [CB-3750](https://issues.apache.org/jira/browse/CB-3750) Fixes spinner on iOS. This closes #89
-* [CB-7696](https://issues.apache.org/jira/browse/CB-7696) Document target=_self behavior for Windows
-* [CB-10040](https://issues.apache.org/jira/browse/CB-10040) - Compile Error in InAppBrowser Plugin for iOS - No known instance method for selector 'URLIsWhitelisted:'
+* CB-9445 Improves executeScript callbacks on iOS
+* CB-10035 Incremented plugin version.
+* CB-10040 - re-fix: backwards compatible with cordova-ios < 4.0
+* CB-8534: Allow plugins to respond to onReceivedHttpAuthRequest. This closes #82
+* CB-3750: Fixes spinner on iOS. This closes #89
+* CB-7696 Document target=_self behavior for Windows
+* CB-10040 - Compile Error in InAppBrowser Plugin for iOS - No known instance method for selector 'URLIsWhitelisted:'

 ### 1.1.0 (Nov 18, 2015)
 * [CB-10035](https://issues.apache.org/jira/browse/CB-10035) Updated `RELEASENOTES` to be newest to oldest
--- a/package.json
+++ b/package.json
@@ -1,8 +1,7 @@
 {
  "name": "cordova-plugin-inappbrowser",
-  "version": "1.7.1",
+  "version": "1.2.1-dev",
  "description": "Cordova InAppBrowser Plugin",
-  "types": "./types/index.d.ts",
  "cordova": {
    "id": "cordova-plugin-inappbrowser",
    "platforms": [
@@ -10,7 +9,6 @@
      "amazon-fireos",
      "ubuntu",
      "ios",
-      "osx",
      "wp7",
      "wp8",
      "windows8",
@@ -33,30 +31,18 @@
    "cordova-amazon-fireos",
    "cordova-ubuntu",
    "cordova-ios",
-    "cordova-osx",
    "cordova-wp7",
    "cordova-wp8",
    "cordova-windows8",
    "cordova-windows",
    "cordova-firefoxos"
  ],
-  "scripts": {
-    "test": "npm run jshint",
-    "jshint": "node node_modules/jshint/bin/jshint www && node node_modules/jshint/bin/jshint src && node node_modules/jshint/bin/jshint tests"
-  },
-  "engines": {
-    "cordovaDependencies": {
-      "0.2.3": {
-        "cordova": ">=3.1.0"
-      },
-      "2.0.0": {
-        "cordova": ">100"
-      }
+  "engines": [
+    {
+      "name": "cordova",
+      "version": ">=3.1.0"
    }
-  },
+  ],
  "author": "Apache Software Foundation",
-  "license": "Apache-2.0",
-  "devDependencies": {
-    "jshint": "^2.6.0"
-  }
+  "license": "Apache 2.0"
 }
--- a/plugin.xml
+++ b/plugin.xml
@@ -20,7 +20,7 @@

 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
           id="cordova-plugin-inappbrowser"
-      version="1.7.1">
+      version="1.2.1-dev">

    <name>InAppBrowser</name>
    <description>Cordova InAppBrowser Plugin</description>
@@ -40,7 +40,7 @@
            <clobbers target="window.open" />
        </js-module>
        <config-file target="res/xml/config.xml" parent="/*">
-            <feature name="InAppBrowser">
+            <feature name="InAppBrowser"> 
                <param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser"/>
            </feature>
        </config-file>
@@ -74,7 +74,7 @@
            <clobbers target="window.open" />
        </js-module>
        <config-file target="res/xml/config.xml" parent="/*">
-            <feature name="InAppBrowser">
+            <feature name="InAppBrowser"> 
                <param name="android-package" value="org.apache.cordova.inappbrowser.InAppBrowser"/>
            </feature>
        </config-file>
@@ -82,24 +82,24 @@
        <source-file src="src/amazon/InAppBrowser.java" target-dir="src/org/apache/cordova/inappbrowser" />
        <source-file src="src/android/InAppBrowserDialog.java" target-dir="src/org/apache/cordova/inappbrowser" />
        <source-file src="src/amazon/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser" />
-
+        
        <!--  drawable src/android/resources -->
        <resource-file src="src/android/res/drawable-hdpi/ic_action_next_item.png" target="res/drawable-hdpi/ic_action_next_item.png" />
        <resource-file src="src/android/res/drawable-mdpi/ic_action_next_item.png" target="res/drawable-mdpi/ic_action_next_item.png" />
        <resource-file src="src/android/res/drawable-xhdpi/ic_action_next_item.png" target="res/drawable-xhdpi/ic_action_next_item.png" />
        <resource-file src="src/android/res/drawable-xxhdpi/ic_action_next_item.png" target="res/drawable-xxhdpi/ic_action_next_item.png" />
-
+        
        <resource-file src="src/android/res/drawable-hdpi/ic_action_previous_item.png" target="res/drawable-hdpi/ic_action_previous_item.png" />
        <resource-file src="src/android/res/drawable-mdpi/ic_action_previous_item.png" target="res/drawable-mdpi/ic_action_previous_item.png" />
        <resource-file src="src/android/res/drawable-xhdpi/ic_action_previous_item.png" target="res/drawable-xhdpi/ic_action_previous_item.png" />
        <resource-file src="src/android/res/drawable-xxhdpi/ic_action_previous_item.png" target="res/drawable-xxhdpi/ic_action_previous_item.png" />
-
+        
        <resource-file src="src/android/res/drawable-hdpi/ic_action_remove.png" target="res/drawable-hdpi/ic_action_remove.png" />
        <resource-file src="src/android/res/drawable-mdpi/ic_action_remove.png" target="res/drawable-mdpi/ic_action_remove.png" />
        <resource-file src="src/android/res/drawable-xhdpi/ic_action_remove.png" target="res/drawable-xhdpi/ic_action_remove.png" />
        <resource-file src="src/android/res/drawable-xxhdpi/ic_action_remove.png" target="res/drawable-xxhdpi/ic_action_remove.png" />
    </platform>
-
+    
    <!-- ubuntu -->
    <platform name="ubuntu">
        <js-module src="www/inappbrowser.js" name="inappbrowser">
@@ -118,35 +118,19 @@
        <js-module src="www/inappbrowser.js" name="inappbrowser">
            <clobbers target="cordova.InAppBrowser.open" />
            <clobbers target="window.open" />
-        </js-module>
+        </js-module>  
        <config-file target="config.xml" parent="/*">
            <feature name="InAppBrowser">
-                <param name="ios-package" value="CDVInAppBrowser" />
+                <param name="ios-package" value="CDVInAppBrowser" /> 
            </feature>
        </config-file>

        <header-file src="src/ios/CDVInAppBrowser.h" />
 	    <source-file src="src/ios/CDVInAppBrowser.m" />
-
+	    
 	    <framework src="CoreGraphics.framework" />
    </platform>

-    <!-- osx -->
-    <platform name="osx">
-        <js-module src="www/inappbrowser.js" name="inappbrowser">
-            <clobbers target="cordova.InAppBrowser.open" />
-            <clobbers target="window.open" />
-        </js-module>
-        <config-file target="config.xml" parent="/*">
-            <feature name="InAppBrowser">
-                <param name="osx-package" value="CDVInAppBrowser" />
-            </feature>
-        </config-file>
-
-        <header-file src="src/osx/CDVInAppBrowser.h" />
-        <source-file src="src/osx/CDVInAppBrowser.m" />
-    </platform>
-
    <!-- wp7 -->
    <platform name="wp7">
        <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
@@ -175,7 +159,7 @@
        <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="cordova.InAppBrowser.open" />
            <clobbers target="window.open" />
@@ -211,11 +195,11 @@
            <clobbers target="window.open" />
        </js-module>
        <js-module src="src/windows/InAppBrowserProxy.js" name="InAppBrowserProxy">
-            <runs />
+            <merges target="" />
        </js-module>
        <asset src="www/inappbrowser.css" target="css/inappbrowser.css" />
    </platform>
-
+  
    <!-- firefoxos -->
    <platform name="firefoxos">
        <config-file target="config.xml" parent="/*">
@@ -226,7 +210,7 @@
            <clobbers target="window.open" />
        </js-module>
        <js-module src="src/firefoxos/InAppBrowserProxy.js" name="InAppBrowserProxy">
-            <runs />
+            <merges target="" />
        </js-module>
    </platform>

@@ -237,7 +221,7 @@
            <clobbers target="window.open" />
        </js-module>
        <js-module src="src/browser/InAppBrowserProxy.js" name="InAppBrowserProxy">
-            <runs />
+            <merges target="" />
        </js-module>
    </platform>
 </plugin>
--- a/src/amazon/InAppBrowser.java
+++ b/src/amazon/InAppBrowser.java
@@ -84,7 +84,6 @@ public class InAppBrowser extends CordovaPlugin {
    private static final String LOAD_ERROR_EVENT = "loaderror";
    private static final String CLEAR_ALL_CACHE = "clearcache";
    private static final String CLEAR_SESSION_CACHE = "clearsessioncache";
-    private static final String HARDWARE_BACK_BUTTON = "hardwareback";

    private InAppBrowserDialog dialog;
    private AmazonWebView inAppWebView;
@@ -95,7 +94,6 @@ public class InAppBrowser extends CordovaPlugin {
    private boolean openWindowHidden = false;
    private boolean clearAllCache= false;
    private boolean clearSessionCache=false;
-    private boolean hadwareBackButton=true;

    /**
     * Executes the request and returns PluginResult.
@@ -214,17 +212,6 @@ public class InAppBrowser extends CordovaPlugin {
            pluginResult.setKeepCallback(true);
            this.callbackContext.sendPluginResult(pluginResult);
        }
-        else if (action.equals("hide")) {
-            this.cordova.getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    dialog.hide();
-                }
-            });
-            PluginResult pluginResult = new PluginResult(PluginResult.Status.OK);
-            pluginResult.setKeepCallback(true);
-            this.callbackContext.sendPluginResult(pluginResult);
-        }
        else {
            return false;
        }
@@ -380,7 +367,7 @@ public class InAppBrowser extends CordovaPlugin {
    /**
     * Checks to see if it is possible to go back one page in history, then does so.
     */
-    public void goBack() {
+    private void goBack() {
        this.cordova.getActivity().runOnUiThread(new Runnable() {
            public void run() {
                if (InAppBrowser.this.inAppWebView.canGoBack()) {
@@ -390,22 +377,6 @@ public class InAppBrowser extends CordovaPlugin {
        });
    }

-    /**
-     * Can the web browser go back?
-     * @return boolean
-     */
-    public boolean canGoBack() {
-        return this.inAppWebView.canGoBack();
-    }
-
-    /**
-     * Has the user set the hardware back button to go back
-     * @return boolean
-     */
-    public boolean hardwareBack() {
-        return hadwareBackButton;
-    } 
-
    /**
     * Checks to see if it is possible to go forward one page in history, then does so.
     */
@@ -487,10 +458,6 @@ public class InAppBrowser extends CordovaPlugin {
            if (hidden != null) {
                openWindowHidden = hidden.booleanValue();
            }
-            Boolean hardwareBack = features.get(HARDWARE_BACK_BUTTON);
-            if (hardwareBack != null) {
-                hadwareBackButton = hardwareBack.booleanValue();
-            }
            Boolean cache = features.get(CLEAR_ALL_CACHE);
            if (cache != null) {
                clearAllCache = cache.booleanValue();
--- a/src/android/InAppBrowser.java
+++ b/src/android/InAppBrowser.java
@@ -19,6 +19,7 @@
 package org.apache.cordova.inappbrowser;

 import android.annotation.SuppressLint;
+import org.apache.cordova.inappbrowser.InAppBrowserDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.provider.Browser;
@@ -29,6 +30,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.InputType;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -39,16 +41,12 @@ import android.view.WindowManager.LayoutParams;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.webkit.CookieManager;
-import android.webkit.CookieSyncManager;
 import android.webkit.HttpAuthHandler;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;

@@ -87,10 +85,6 @@ public class InAppBrowser extends CordovaPlugin {
    private static final String CLEAR_ALL_CACHE = "clearcache";
    private static final String CLEAR_SESSION_CACHE = "clearsessioncache";
    private static final String HARDWARE_BACK_BUTTON = "hardwareback";
-    private static final String MEDIA_PLAYBACK_REQUIRES_USER_ACTION = "mediaPlaybackRequiresUserAction";
-    private static final String SHOULD_PAUSE = "shouldPauseOnSuspend";
-    private static final Boolean DEFAULT_HARDWARE_BACK = true;
-    private static final String USER_WIDE_VIEW_PORT = "useWideViewPort";

    private InAppBrowserDialog dialog;
    private WebView inAppWebView;
@@ -102,13 +96,6 @@ public class InAppBrowser extends CordovaPlugin {
    private boolean clearAllCache = false;
    private boolean clearSessionCache = false;
    private boolean hadwareBackButton = true;
-    private boolean mediaPlaybackRequiresUserGesture = false;
-    private boolean shouldPauseInAppBrowser = false;
-    private boolean useWideViewPort = true;
-    private ValueCallback<Uri> mUploadCallback;
-    private ValueCallback<Uri[]> mUploadCallbackLollipop;
-    private final static int FILECHOOSER_REQUESTCODE = 1;
-    private final static int FILECHOOSER_REQUESTCODE_LOLLIPOP = 2;

    /**
     * Executes the request and returns PluginResult.
@@ -129,7 +116,7 @@ public class InAppBrowser extends CordovaPlugin {
            final String target = t;
            final HashMap<String, Boolean> features = parseFeature(args.optString(2));

-            LOG.d(LOG_TAG, "target = " + target);
+            Log.d(LOG_TAG, "target = " + target);

            this.cordova.getActivity().runOnUiThread(new Runnable() {
                @Override
@@ -137,7 +124,7 @@ public class InAppBrowser extends CordovaPlugin {
                    String result = "";
                    // SELF
                    if (SELF.equals(target)) {
-                        LOG.d(LOG_TAG, "in self");
+                        Log.d(LOG_TAG, "in self");
                        /* This code exists for compatibility between 3.x and 4.x versions of Cordova.
                         * Previously the Config class had a static method, isUrlWhitelisted(). That
                         * responsibility has been moved to the plugins, with an aggregating method in
@@ -152,11 +139,8 @@ public class InAppBrowser extends CordovaPlugin {
                                Method iuw = Config.class.getMethod("isUrlWhiteListed", String.class);
                                shouldAllowNavigation = (Boolean)iuw.invoke(null, url);
                            } catch (NoSuchMethodException e) {
-                                LOG.d(LOG_TAG, e.getLocalizedMessage());
                            } catch (IllegalAccessException e) {
-                                LOG.d(LOG_TAG, e.getLocalizedMessage());
                            } catch (InvocationTargetException e) {
-                                LOG.d(LOG_TAG, e.getLocalizedMessage());
                            }
                        }
                        if (shouldAllowNavigation == null) {
@@ -166,23 +150,20 @@ public class InAppBrowser extends CordovaPlugin {
                                Method san = pm.getClass().getMethod("shouldAllowNavigation", String.class);
                                shouldAllowNavigation = (Boolean)san.invoke(pm, url);
                            } catch (NoSuchMethodException e) {
-                                LOG.d(LOG_TAG, e.getLocalizedMessage());
                            } catch (IllegalAccessException e) {
-                                LOG.d(LOG_TAG, e.getLocalizedMessage());
                            } catch (InvocationTargetException e) {
-                                LOG.d(LOG_TAG, e.getLocalizedMessage());
                            }
                        }
                        // load in webview
                        if (Boolean.TRUE.equals(shouldAllowNavigation)) {
-                            LOG.d(LOG_TAG, "loading in webview");
+                            Log.d(LOG_TAG, "loading in webview");
                            webView.loadUrl(url);
                        }
                        //Load the dialer
                        else if (url.startsWith(WebView.SCHEME_TEL))
                        {
                            try {
-                                LOG.d(LOG_TAG, "loading in dialer");
+                                Log.d(LOG_TAG, "loading in dialer");
                                Intent intent = new Intent(Intent.ACTION_DIAL);
                                intent.setData(Uri.parse(url));
                                cordova.getActivity().startActivity(intent);
@@ -192,18 +173,18 @@ public class InAppBrowser extends CordovaPlugin {
                        }
                        // load in InAppBrowser
                        else {
-                            LOG.d(LOG_TAG, "loading in InAppBrowser");
+                            Log.d(LOG_TAG, "loading in InAppBrowser");
                            result = showWebPage(url, features);
                        }
                    }
                    // SYSTEM
                    else if (SYSTEM.equals(target)) {
-                        LOG.d(LOG_TAG, "in system");
+                        Log.d(LOG_TAG, "in system");
                        result = openExternal(url);
                    }
                    // BLANK - or anything else
                    else {
-                        LOG.d(LOG_TAG, "in blank");
+                        Log.d(LOG_TAG, "in blank");
                        result = showWebPage(url, features);
                    }

@@ -219,7 +200,7 @@ public class InAppBrowser extends CordovaPlugin {
        else if (action.equals("injectScriptCode")) {
            String jsWrapper = null;
            if (args.getBoolean(1)) {
-                jsWrapper = String.format("(function(){prompt(JSON.stringify([eval(%%s)]), 'gap-iab://%s')})()", callbackContext.getCallbackId());
+                jsWrapper = String.format("prompt(JSON.stringify([eval(%%s)]), 'gap-iab://%s')", callbackContext.getCallbackId());
            }
            injectDeferredObject(args.getString(0), jsWrapper);
        }
@@ -261,17 +242,6 @@ public class InAppBrowser extends CordovaPlugin {
            pluginResult.setKeepCallback(true);
            this.callbackContext.sendPluginResult(pluginResult);
        }
-        else if (action.equals("hide")) {
-            this.cordova.getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    dialog.hide();
-                }
-            });
-            PluginResult pluginResult = new PluginResult(PluginResult.Status.OK);
-            pluginResult.setKeepCallback(true);
-            this.callbackContext.sendPluginResult(pluginResult);
-        }
        else {
            return false;
        }
@@ -286,26 +256,6 @@ public class InAppBrowser extends CordovaPlugin {
        closeDialog();
    }

-    /**
-     * Called when the system is about to start resuming a previous activity.
-     */
-    @Override
-    public void onPause(boolean multitasking) {
-        if (shouldPauseInAppBrowser) {
-            inAppWebView.onPause();
-        }
-    }
-
-    /**
-     * Called when the activity will start interacting with the user.
-     */
-    @Override
-    public void onResume(boolean multitasking) {
-        if (shouldPauseInAppBrowser) {
-            inAppWebView.onResume();
-        }
-    }
-
    /**
     * Called by AccelBroker when listener is to be shut down.
     * Stop listener.
@@ -331,33 +281,29 @@ public class InAppBrowser extends CordovaPlugin {
     *                    which should be executed directly.
     */
    private void injectDeferredObject(String source, String jsWrapper) {
-        if (inAppWebView!=null) {
-            String scriptToInject;
-            if (jsWrapper != null) {
-                org.json.JSONArray jsonEsc = new org.json.JSONArray();
-                jsonEsc.put(source);
-                String jsonRepr = jsonEsc.toString();
-                String jsonSourceString = jsonRepr.substring(1, jsonRepr.length()-1);
-                scriptToInject = String.format(jsWrapper, jsonSourceString);
-            } else {
-                scriptToInject = source;
-            }
-            final String finalScriptToInject = scriptToInject;
-            this.cordova.getActivity().runOnUiThread(new Runnable() {
-                @SuppressLint("NewApi")
-                @Override
-                public void run() {
-                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
-                        // This action will have the side-effect of blurring the currently focused element
-                        inAppWebView.loadUrl("javascript:" + finalScriptToInject);
-                    } else {
-                        inAppWebView.evaluateJavascript(finalScriptToInject, null);
-                    }
-                }
-            });
+        String scriptToInject;
+        if (jsWrapper != null) {
+            org.json.JSONArray jsonEsc = new org.json.JSONArray();
+            jsonEsc.put(source);
+            String jsonRepr = jsonEsc.toString();
+            String jsonSourceString = jsonRepr.substring(1, jsonRepr.length()-1);
+            scriptToInject = String.format(jsWrapper, jsonSourceString);
        } else {
-            LOG.d(LOG_TAG, "Can't inject code into the system browser");
+            scriptToInject = source;
        }
+        final String finalScriptToInject = scriptToInject;
+        this.cordova.getActivity().runOnUiThread(new Runnable() {
+            @SuppressLint("NewApi")
+            @Override
+            public void run() {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
+                    // This action will have the side-effect of blurring the currently focused element
+                    inAppWebView.loadUrl("javascript:" + finalScriptToInject);
+                } else {
+                    inAppWebView.evaluateJavascript(finalScriptToInject, null);
+                }
+            }
+        });
    }

    /**
@@ -406,9 +352,8 @@ public class InAppBrowser extends CordovaPlugin {
            intent.putExtra(Browser.EXTRA_APPLICATION_ID, cordova.getActivity().getPackageName());
            this.cordova.getActivity().startActivity(intent);
            return "";
-        // not catching FileUriExposedException explicitly because buildtools<24 doesn't know about it
-        } catch (java.lang.RuntimeException e) {
-            LOG.d(LOG_TAG, "InAppBrowser: Error loading url "+url+":"+ e.toString());
+        } catch (android.content.ActivityNotFoundException e) {
+            Log.d(LOG_TAG, "InAppBrowser: Error loading url "+url+":"+ e.toString());
            return e.toString();
        }
    }
@@ -417,22 +362,20 @@ public class InAppBrowser extends CordovaPlugin {
     * Closes the dialog
     */
    public void closeDialog() {
+        final WebView childView = this.inAppWebView;
+        // The JS protects against multiple calls, so this should happen only when
+        // closeDialog() is called by other native code.
+        if (childView == null) {
+            return;
+        }
        this.cordova.getActivity().runOnUiThread(new Runnable() {
            @Override
            public void run() {
-                final WebView childView = inAppWebView;
-                // The JS protects against multiple calls, so this should happen only when
-                // closeDialog() is called by other native code.
-                if (childView == null) {
-                    return;
-                }
-
                childView.setWebViewClient(new WebViewClient() {
                    // NB: wait for about:blank before dismissing
                    public void onPageFinished(WebView view, String url) {
                        if (dialog != null) {
                            dialog.dismiss();
-                            dialog = null;
                        }
                    }
                });
@@ -440,16 +383,16 @@ public class InAppBrowser extends CordovaPlugin {
                // other than your app's UI thread, it can cause unexpected results."
                // http://developer.android.com/guide/webapps/migrating.html#Threads
                childView.loadUrl("about:blank");
-
-                try {
-                    JSONObject obj = new JSONObject();
-                    obj.put("type", EXIT_EVENT);
-                    sendUpdate(obj, false);
-                } catch (JSONException ex) {
-                    LOG.d(LOG_TAG, "Should never happen");
-                }
            }
        });
+
+        try {
+            JSONObject obj = new JSONObject();
+            obj.put("type", EXIT_EVENT);
+            sendUpdate(obj, false);
+        } catch (JSONException ex) {
+            Log.d(LOG_TAG, "Should never happen");
+        }
    }

    /**
@@ -528,8 +471,6 @@ public class InAppBrowser extends CordovaPlugin {
        showLocationBar = true;
        showZoomControls = true;
        openWindowHidden = false;
-        mediaPlaybackRequiresUserGesture = false;
-
        if (features != null) {
            Boolean show = features.get(LOCATION);
            if (show != null) {
@@ -546,12 +487,6 @@ public class InAppBrowser extends CordovaPlugin {
            Boolean hardwareBack = features.get(HARDWARE_BACK_BUTTON);
            if (hardwareBack != null) {
                hadwareBackButton = hardwareBack.booleanValue();
-            } else {
-                hadwareBackButton = DEFAULT_HARDWARE_BACK;
-            }
-            Boolean mediaPlayback = features.get(MEDIA_PLAYBACK_REQUIRES_USER_ACTION);
-            if (mediaPlayback != null) {
-                mediaPlaybackRequiresUserGesture = mediaPlayback.booleanValue();
            }
            Boolean cache = features.get(CLEAR_ALL_CACHE);
            if (cache != null) {
@@ -562,14 +497,6 @@ public class InAppBrowser extends CordovaPlugin {
                    clearSessionCache = cache.booleanValue();
                }
            }
-            Boolean shouldPause = features.get(SHOULD_PAUSE);
-            if (shouldPause != null) {
-                shouldPauseInAppBrowser = shouldPause.booleanValue();
-            }
-            Boolean wideViewPort = features.get(USER_WIDE_VIEW_PORT);
-            if (wideViewPort != null ) {
-		            useWideViewPort = wideViewPort.booleanValue();
-            }
        }

        final CordovaWebView thatWebView = this.webView;
@@ -592,12 +519,6 @@ public class InAppBrowser extends CordovaPlugin {

            @SuppressLint("NewApi")
            public void run() {
-
-                // CB-6702 InAppBrowser hangs when opening more than one instance
-                if (dialog != null) {
-                    dialog.dismiss();
-                };
-
                // Let's create the main dialog
                dialog = new InAppBrowserDialog(cordova.getActivity(), android.R.style.Theme_NoTitleBar);
                dialog.getWindow().getAttributes().windowAnimations = android.R.style.Animation_Dialog;
@@ -626,7 +547,7 @@ public class InAppBrowser extends CordovaPlugin {
                actionButtonContainer.setId(Integer.valueOf(1));

                // Back button
-                ImageButton back = new ImageButton(cordova.getActivity());
+                Button back = new Button(cordova.getActivity());
                RelativeLayout.LayoutParams backLayoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
                backLayoutParams.addRule(RelativeLayout.ALIGN_LEFT);
                back.setLayoutParams(backLayoutParams);
@@ -635,16 +556,14 @@ public class InAppBrowser extends CordovaPlugin {
                Resources activityRes = cordova.getActivity().getResources();
                int backResId = activityRes.getIdentifier("ic_action_previous_item", "drawable", cordova.getActivity().getPackageName());
                Drawable backIcon = activityRes.getDrawable(backResId);
-                if (Build.VERSION.SDK_INT >= 16)
-                    back.setBackground(null);
+                if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN)
+                {
+                    back.setBackgroundDrawable(backIcon);
+                }
                else
-                    back.setBackgroundDrawable(null);
-                back.setImageDrawable(backIcon);
-                back.setScaleType(ImageView.ScaleType.FIT_CENTER);
-                back.setPadding(0, this.dpToPixels(10), 0, this.dpToPixels(10));
-                if (Build.VERSION.SDK_INT >= 16)
-                    back.getAdjustViewBounds();
-
+                {
+                    back.setBackground(backIcon);
+                }
                back.setOnClickListener(new View.OnClickListener() {
                    public void onClick(View v) {
                        goBack();
@@ -652,7 +571,7 @@ public class InAppBrowser extends CordovaPlugin {
                });

                // Forward button
-                ImageButton forward = new ImageButton(cordova.getActivity());
+                Button forward = new Button(cordova.getActivity());
                RelativeLayout.LayoutParams forwardLayoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
                forwardLayoutParams.addRule(RelativeLayout.RIGHT_OF, 2);
                forward.setLayoutParams(forwardLayoutParams);
@@ -660,16 +579,14 @@ public class InAppBrowser extends CordovaPlugin {
                forward.setId(Integer.valueOf(3));
                int fwdResId = activityRes.getIdentifier("ic_action_next_item", "drawable", cordova.getActivity().getPackageName());
                Drawable fwdIcon = activityRes.getDrawable(fwdResId);
-                if (Build.VERSION.SDK_INT >= 16)
-                    forward.setBackground(null);
+                if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN)
+                {
+                    forward.setBackgroundDrawable(fwdIcon);
+                }
                else
-                    forward.setBackgroundDrawable(null);
-                forward.setImageDrawable(fwdIcon);
-                forward.setScaleType(ImageView.ScaleType.FIT_CENTER);
-                forward.setPadding(0, this.dpToPixels(10), 0, this.dpToPixels(10));
-                if (Build.VERSION.SDK_INT >= 16)
-                    forward.getAdjustViewBounds();
-
+                {
+                    forward.setBackground(fwdIcon);
+                }
                forward.setOnClickListener(new View.OnClickListener() {
                    public void onClick(View v) {
                        goForward();
@@ -700,24 +617,22 @@ public class InAppBrowser extends CordovaPlugin {
                });

                // Close/Done button
-                ImageButton close = new ImageButton(cordova.getActivity());
+                Button close = new Button(cordova.getActivity());
                RelativeLayout.LayoutParams closeLayoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
                closeLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
                close.setLayoutParams(closeLayoutParams);
-                close.setContentDescription("Close Button");
+                forward.setContentDescription("Close Button");
                close.setId(Integer.valueOf(5));
                int closeResId = activityRes.getIdentifier("ic_action_remove", "drawable", cordova.getActivity().getPackageName());
                Drawable closeIcon = activityRes.getDrawable(closeResId);
-                if (Build.VERSION.SDK_INT >= 16)
-                    close.setBackground(null);
+                if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN)
+                {
+                    close.setBackgroundDrawable(closeIcon);
+                }
                else
-                    close.setBackgroundDrawable(null);
-                close.setImageDrawable(closeIcon);
-                close.setScaleType(ImageView.ScaleType.FIT_CENTER);
-                back.setPadding(0, this.dpToPixels(10), 0, this.dpToPixels(10));
-                if (Build.VERSION.SDK_INT >= 16)
-                    close.getAdjustViewBounds();
-
+                {
+                    close.setBackground(closeIcon);
+                }
                close.setOnClickListener(new View.OnClickListener() {
                    public void onClick(View v) {
                        closeDialog();
@@ -728,49 +643,7 @@ public class InAppBrowser extends CordovaPlugin {
                inAppWebView = new WebView(cordova.getActivity());
                inAppWebView.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
                inAppWebView.setId(Integer.valueOf(6));
-                // File Chooser Implemented ChromeClient
-                inAppWebView.setWebChromeClient(new InAppChromeClient(thatWebView) {
-                    // For Android 5.0+
-                    public boolean onShowFileChooser (WebView webView, ValueCallback<Uri[]> filePathCallback, WebChromeClient.FileChooserParams fileChooserParams)
-                    {
-                        LOG.d(LOG_TAG, "File Chooser 5.0+");
-                        // If callback exists, finish it.
-                        if(mUploadCallbackLollipop != null) {
-                            mUploadCallbackLollipop.onReceiveValue(null);
-                        }
-                        mUploadCallbackLollipop = filePathCallback;
-
-                        // Create File Chooser Intent
-                        Intent content = new Intent(Intent.ACTION_GET_CONTENT);
-                        content.addCategory(Intent.CATEGORY_OPENABLE);
-                        content.setType("*/*");
-
-                        // Run cordova startActivityForResult
-                        cordova.startActivityForResult(InAppBrowser.this, Intent.createChooser(content, "Select File"), FILECHOOSER_REQUESTCODE_LOLLIPOP);
-                        return true;
-                    }
-
-                    // For Android 4.1+
-                    public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType, String capture)
-                    {
-                        LOG.d(LOG_TAG, "File Chooser 4.1+");
-                        // Call file chooser for Android 3.0+
-                        openFileChooser(uploadMsg, acceptType);
-                    }
-
-                    // For Android 3.0+
-                    public void openFileChooser(ValueCallback<Uri> uploadMsg, String acceptType)
-                    {
-                        LOG.d(LOG_TAG, "File Chooser 3.0+");
-                        mUploadCallback = uploadMsg;
-                        Intent content = new Intent(Intent.ACTION_GET_CONTENT);
-                        content.addCategory(Intent.CATEGORY_OPENABLE);
-
-                        // run startActivityForResult
-                        cordova.startActivityForResult(InAppBrowser.this, Intent.createChooser(content, "Select File"), FILECHOOSER_REQUESTCODE);
-                    }
-
-                });
+                inAppWebView.setWebChromeClient(new InAppChromeClient(thatWebView));
                WebViewClient client = new InAppBrowserClient(thatWebView, edittext);
                inAppWebView.setWebViewClient(client);
                WebSettings settings = inAppWebView.getSettings();
@@ -779,20 +652,6 @@ public class InAppBrowser extends CordovaPlugin {
                settings.setBuiltInZoomControls(showZoomControls);
                settings.setPluginState(android.webkit.WebSettings.PluginState.ON);

-                if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                    settings.setMediaPlaybackRequiresUserGesture(mediaPlaybackRequiresUserGesture);
-                }
-
-                String overrideUserAgent = preferences.getString("OverrideUserAgent", null);
-                String appendUserAgent = preferences.getString("AppendUserAgent", null);
-
-                if (overrideUserAgent != null) {
-                    settings.setUserAgentString(overrideUserAgent);
-                }
-                if (appendUserAgent != null) {
-                    settings.setUserAgentString(settings.getUserAgentString() + appendUserAgent);
-                }
-
                //Toggle whether this is enabled or not!
                Bundle appSettings = cordova.getActivity().getIntent().getExtras();
                boolean enableDatabase = appSettings == null ? true : appSettings.getBoolean("InAppBrowserStorageEnabled", true);
@@ -812,7 +671,7 @@ public class InAppBrowser extends CordovaPlugin {
                inAppWebView.loadUrl(url);
                inAppWebView.setId(Integer.valueOf(6));
                inAppWebView.getSettings().setLoadWithOverviewMode(true);
-                inAppWebView.getSettings().setUseWideViewPort(useWideViewPort);
+                inAppWebView.getSettings().setUseWideViewPort(true);
                inAppWebView.requestFocus();
                inAppWebView.requestFocusFromTouch();

@@ -879,42 +738,6 @@ public class InAppBrowser extends CordovaPlugin {
        }
    }

-    /**
-     * Receive File Data from File Chooser
-     *
-     * @param requestCode the requested code from chromeclient
-     * @param resultCode the result code returned from android system
-     * @param intent the data from android file chooser
-     */
-    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        // For Android >= 5.0
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            LOG.d(LOG_TAG, "onActivityResult (For Android >= 5.0)");
-            // If RequestCode or Callback is Invalid
-            if(requestCode != FILECHOOSER_REQUESTCODE_LOLLIPOP || mUploadCallbackLollipop == null) {
-                super.onActivityResult(requestCode, resultCode, intent);
-                return;
-            }
-            mUploadCallbackLollipop.onReceiveValue(WebChromeClient.FileChooserParams.parseResult(resultCode, intent));
-            mUploadCallbackLollipop = null;
-        }
-        // For Android < 5.0
-        else {
-            LOG.d(LOG_TAG, "onActivityResult (For Android < 5.0)");
-            // If RequestCode or Callback is Invalid
-            if(requestCode != FILECHOOSER_REQUESTCODE || mUploadCallback == null) {
-                super.onActivityResult(requestCode, resultCode, intent);
-                return;
-            }
-
-            if (null == mUploadCallback) return;
-            Uri result = intent == null || resultCode != cordova.getActivity().RESULT_OK ? null : intent.getData();
-
-            mUploadCallback.onReceiveValue(result);
-            mUploadCallback = null;
-        }
-    }
-
    /**
     * The webview client receives notifications about appView
     */
@@ -952,7 +775,7 @@ public class InAppBrowser extends CordovaPlugin {
                } catch (android.content.ActivityNotFoundException e) {
                    LOG.e(LOG_TAG, "Error dialing " + url + ": " + e.toString());
                }
-            } else if (url.startsWith("geo:") || url.startsWith(WebView.SCHEME_MAILTO) || url.startsWith("market:") || url.startsWith("intent:")) {
+            } else if (url.startsWith("geo:") || url.startsWith(WebView.SCHEME_MAILTO) || url.startsWith("market:")) {
                try {
                    Intent intent = new Intent(Intent.ACTION_VIEW);
                    intent.setData(Uri.parse(url));
@@ -1039,17 +862,6 @@ public class InAppBrowser extends CordovaPlugin {
        public void onPageFinished(WebView view, String url) {
            super.onPageFinished(view, url);

-            // CB-10395 InAppBrowser's WebView not storing cookies reliable to local device storage
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
-                CookieManager.getInstance().flush();
-            } else {
-                CookieSyncManager.getInstance().sync();
-            }
-
-            // https://issues.apache.org/jira/browse/CB-11248
-            view.clearFocus();
-            view.requestFocus();
-
            try {
                JSONObject obj = new JSONObject();
                obj.put("type", LOAD_STOP_EVENT);
@@ -1057,7 +869,7 @@ public class InAppBrowser extends CordovaPlugin {

                sendUpdate(obj, true);
            } catch (JSONException ex) {
-                LOG.d(LOG_TAG, "Should never happen");
+                Log.d(LOG_TAG, "Should never happen");
            }
        }

@@ -1073,10 +885,10 @@ public class InAppBrowser extends CordovaPlugin {

                sendUpdate(obj, true, PluginResult.Status.ERROR);
            } catch (JSONException ex) {
-                LOG.d(LOG_TAG, "Should never happen");
+                Log.d(LOG_TAG, "Should never happen");
            }
        }
-
+        
        /**
         * On received http auth request.
         */
@@ -1089,30 +901,26 @@ public class InAppBrowser extends CordovaPlugin {
                Method gpm = webView.getClass().getMethod("getPluginManager");
                pluginManager = (PluginManager)gpm.invoke(webView);
            } catch (NoSuchMethodException e) {
-                LOG.d(LOG_TAG, e.getLocalizedMessage());
            } catch (IllegalAccessException e) {
-                LOG.d(LOG_TAG, e.getLocalizedMessage());
            } catch (InvocationTargetException e) {
-                LOG.d(LOG_TAG, e.getLocalizedMessage());
            }
-
+            
            if (pluginManager == null) {
                try {
                    Field pmf = webView.getClass().getField("pluginManager");
                    pluginManager = (PluginManager)pmf.get(webView);
                } catch (NoSuchFieldException e) {
-                    LOG.d(LOG_TAG, e.getLocalizedMessage());
                } catch (IllegalAccessException e) {
-                    LOG.d(LOG_TAG, e.getLocalizedMessage());
                }
            }
-
+            
            if (pluginManager != null && pluginManager.onReceivedHttpAuthRequest(webView, new CordovaHttpAuthHandler(handler), host, realm)) {
                return;
            }
-
+            
            // By default handle 401 like we'd normally do!
            super.onReceivedHttpAuthRequest(view, handler, host, realm);
        }
    }
 }
+
--- a/src/android/InAppBrowserDialog.java
+++ b/src/android/InAppBrowserDialog.java
@@ -21,6 +21,7 @@ package org.apache.cordova.inappbrowser;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
+import android.util.Log;

 import org.json.JSONException;
 import org.json.JSONObject;
--- a/src/browser/InAppBrowserProxy.js
+++ b/src/browser/InAppBrowserProxy.js
@@ -19,7 +19,10 @@
 *
 */

-var modulemapper = require('cordova/modulemapper');
+var cordova = require('cordova'),
+    channel = require('cordova/channel'),
+    modulemapper = require('cordova/modulemapper'),
+    urlutil = require('cordova/urlutil');

 var browserWrap,
    popup,
@@ -31,15 +34,15 @@ var browserWrap,

 function attachNavigationEvents(element, callback) {
    var onError = function () {
-        callback({ type: "loaderror", url: this.contentWindow.location.href}, {keepCallback: true});
+        callback({ type: "loaderror", url: this.contentWindow.location}, {keepCallback: true});
    };

    element.addEventListener("pageshow", function () {
-        callback({ type: "loadstart", url: this.contentWindow.location.href}, {keepCallback: true});
+        callback({ type: "loadstart", url: this.contentWindow.location}, {keepCallback: true});
    });

    element.addEventListener("load", function () {
-        callback({ type: "loadstop", url: this.contentWindow.location.href}, {keepCallback: true});
+        callback({ type: "loadstop", url: this.contentWindow.location}, {keepCallback: true});
    });

    element.addEventListener("error", onError);
@@ -66,7 +69,8 @@ var IAB = {
    open: function (win, lose, args) {
        var strUrl = args[0],
            target = args[1],
-            features = args[2];
+            features = args[2],
+            url;

        if (target === "_self" || !target) {
            window.location = strUrl;
@@ -77,12 +81,9 @@ var IAB = {
            if (!browserWrap) {
                browserWrap = document.createElement("div");
                browserWrap.style.position = "absolute";
-                browserWrap.style.top = "0";
-                browserWrap.style.left = "0";
-                browserWrap.style.boxSizing = "border-box";
                browserWrap.style.borderWidth = "40px";
-                browserWrap.style.width = "100vw";
-                browserWrap.style.height = "100vh";
+                browserWrap.style.width = "calc(100% - 80px)";
+                browserWrap.style.height = "calc(100% - 80px)";
                browserWrap.style.borderStyle = "solid";
                browserWrap.style.borderColor = "rgba(0,0,0,0.25)";

@@ -107,7 +108,6 @@ var IAB = {

            if (features.indexOf("location=yes") !== -1 || features.indexOf("location") === -1) {
                popup.style.height = "calc(100% - 60px)";
-                popup.style.marginBottom = "-4px";

                navigationButtonsDiv = document.createElement("div");
                navigationButtonsDiv.style.height = "60px";
@@ -193,9 +193,7 @@ var IAB = {
        if (browserWrap && popup) {
            try {
                popup.contentWindow.eval(code);
-                if (hasCallback) {
-                    win([]);
-                }
+                hasCallback && win([]);
            } catch(e) {
                console.error('Error occured while trying to injectScriptCode: ' + JSON.stringify(e));
            }
@@ -205,25 +203,19 @@ var IAB = {
    injectScriptFile: function (win, fail, args) {
        var msg = 'Browser cordova-plugin-inappbrowser injectScriptFile is not yet implemented';
        console.warn(msg);
-        if (fail) {
-            fail(msg);
-        }
+        fail && fail(msg);
    }, 

    injectStyleCode: function (win, fail, args) {
        var msg = 'Browser cordova-plugin-inappbrowser injectStyleCode is not yet implemented';
        console.warn(msg);
-        if (fail) {
-            fail(msg);
-        }
+        fail && fail(msg);
    },

    injectStyleFile: function (win, fail, args) {
        var msg = 'Browser cordova-plugin-inappbrowser injectStyleFile is not yet implemented';
        console.warn(msg);
-        if (fail) {
-            fail(msg);
-        }
+        fail && fail(msg);
    }
 };

--- a/src/firefoxos/InAppBrowserProxy.js
+++ b/src/firefoxos/InAppBrowserProxy.js
@@ -21,7 +21,9 @@

 // https://developer.mozilla.org/en-US/docs/WebAPI/Browser

-var modulemapper = require('cordova/modulemapper');
+var cordova = require('cordova'),
+    channel = require('cordova/channel'),
+    modulemapper = require('cordova/modulemapper');

 var origOpenFunc = modulemapper.getOriginalSymbol(window, 'window.open');
 var browserWrap;
@@ -43,15 +45,13 @@ var IABExecs = {
        console.error('[FirefoxOS] show not implemented');
    },

-    hide: function (win, lose) {
-        console.error('[FirefoxOS] hide not implemented');
-    },
-
    open: function (win, lose, args) {
        var strUrl = args[0],
            target = args[1],
            features_string = args[2] || "location=yes", //location=yes is default
-            features = {};
+            features = {},
+            url,
+            elem;

        var features_list = features_string.split(',');
        features_list.forEach(function(feature) {
@@ -61,7 +61,7 @@ var IABExecs = {
            } else if (tup[1] == 'no') {
                tup[1] = false;
            } else {
-                var number = parseInt(tup[1]);
+                var number = parseInt(tup[1]);    
                if (!isNaN(number)) {
                    tup[1] = number;
                }
@@ -115,7 +115,7 @@ var IABExecs = {
            back.classList.add('inAppBrowserBack');
            forward.classList.add('inAppBrowserForward');

-            var checkForwardBackward = function () {
+            function checkForwardBackward() {
                var backReq = browserElem.getCanGoBack();
                backReq.onsuccess = function() {
                    if (this.result) {
@@ -123,7 +123,7 @@ var IABExecs = {
                    } else {
                        back.classList.add('disabled');
                    }
-                };
+                }
                var forwardReq = browserElem.getCanGoForward();
                forwardReq.onsuccess = function() {
                    if (this.result) {
@@ -131,7 +131,7 @@ var IABExecs = {
                    } else {
                        forward.classList.add('disabled');
                    }
-                };
+                }
            };

            browserElem.addEventListener('mozbrowserloadend', checkForwardBackward);
@@ -163,16 +163,16 @@ var IABExecs = {
                win({
                    type:'loadstart',
                    url : e.detail
-                });
+                })
            }, false);
            browserElem.addEventListener('mozbrowserloadend', function(e){
-                win({type:'loadstop'});
+                win({type:'loadstop'})
            }, false);
            browserElem.addEventListener('mozbrowsererror', function(e){
-                win({type:'loaderror'});
+                win({type:'loaderror'})
            }, false);
            browserElem.addEventListener('mozbrowserclose', function(e){
-                win({type:'exit'});
+                win({type:'exit'})
            }, false);
        } else {
            window.location = strUrl;
--- a/src/ios/CDVInAppBrowser.h
+++ b/src/ios/CDVInAppBrowser.h
@@ -40,7 +40,6 @@
 - (void)close:(CDVInvokedUrlCommand*)command;
 - (void)injectScriptCode:(CDVInvokedUrlCommand*)command;
 - (void)show:(CDVInvokedUrlCommand*)command;
- (void)hide:(CDVInvokedUrlCommand*)command;

@end

--- a/src/ios/CDVInAppBrowser.m
+++ b/src/ios/CDVInAppBrowser.m
@@ -29,7 +29,6 @@
 #define    kInAppBrowserToolbarBarPositionTop @"top"

 #define    TOOLBAR_HEIGHT 44.0
-#define    STATUSBAR_HEIGHT 20.0
 #define    LOCATIONBAR_HEIGHT 21.0
 #define    FOOTER_HEIGHT ((TOOLBAR_HEIGHT) + (LOCATIONBAR_HEIGHT))

@@ -48,11 +47,6 @@
    _callbackIdPattern = nil;
 }

- (id)settingForKey:(NSString*)key
-{
-    return [self.commandDelegate.settings objectForKey:[key lowercaseString]];
-}
-
 - (void)onReset
 {
    [self close:nil];
@@ -143,16 +137,8 @@
    }

    if (self.inAppBrowserViewController == nil) {
-        NSString* userAgent = [CDVUserAgentUtil originalUserAgent];
-        NSString* overrideUserAgent = [self settingForKey:@"OverrideUserAgent"];
-        NSString* appendUserAgent = [self settingForKey:@"AppendUserAgent"];
-        if(overrideUserAgent){
-            userAgent = overrideUserAgent;
-        }
-        if(appendUserAgent){
-            userAgent = [userAgent stringByAppendingString: appendUserAgent];
-        }
-        self.inAppBrowserViewController = [[CDVInAppBrowserViewController alloc] initWithUserAgent:userAgent prevUserAgent:[self.commandDelegate userAgent] browserOptions: browserOptions];
+        NSString* originalUA = [CDVUserAgentUtil originalUserAgent];
+        self.inAppBrowserViewController = [[CDVInAppBrowserViewController alloc] initWithUserAgent:originalUA prevUserAgent:[self.commandDelegate userAgent] browserOptions: browserOptions];
        self.inAppBrowserViewController.navigationDelegate = self;

        if ([self.viewController conformsToProtocol:@protocol(CDVScreenOrientationDelegate)]) {
@@ -232,45 +218,13 @@
                                   initWithRootViewController:self.inAppBrowserViewController];
    nav.orientationDelegate = self.inAppBrowserViewController;
    nav.navigationBarHidden = YES;
-    nav.modalPresentationStyle = self.inAppBrowserViewController.modalPresentationStyle;

    __weak CDVInAppBrowser* weakSelf = self;

    // Run later to avoid the "took a long time" log message.
    dispatch_async(dispatch_get_main_queue(), ^{
        if (weakSelf.inAppBrowserViewController != nil) {
-            CGRect frame = [[UIScreen mainScreen] bounds];
-            UIWindow *tmpWindow = [[UIWindow alloc] initWithFrame:frame];
-            UIViewController *tmpController = [[UIViewController alloc] init];
-            [tmpWindow setRootViewController:tmpController];
-            [tmpWindow setWindowLevel:UIWindowLevelNormal];
-
-            [tmpWindow makeKeyAndVisible];
-            [tmpController presentViewController:nav animated:YES completion:nil];
-        }
-    });
-}
-
- (void)hide:(CDVInvokedUrlCommand*)command
-{
-    if (self.inAppBrowserViewController == nil) {
-        NSLog(@"Tried to hide IAB after it was closed.");
-        return;
-
-
-    }
-    if (_previousStatusBarStyle == -1) {
-        NSLog(@"Tried to hide IAB while already hidden");
-        return;
-    }
-
-    _previousStatusBarStyle = [UIApplication sharedApplication].statusBarStyle;
-
-    // Run later to avoid the "took a long time" log message.
-    dispatch_async(dispatch_get_main_queue(), ^{
-        if (self.inAppBrowserViewController != nil) {
-            _previousStatusBarStyle = -1;
-            [self.viewController dismissViewControllerAnimated:YES completion:nil];
+            [weakSelf.viewController presentViewController:nav animated:YES completion:nil];
        }
    });
 }
@@ -294,8 +248,11 @@

 - (void)openInSystem:(NSURL*)url
 {
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:CDVPluginHandleOpenURLNotification object:url]];
-    [[UIApplication sharedApplication] openURL:url];
+    if ([[UIApplication sharedApplication] canOpenURL:url]) {
+        [[UIApplication sharedApplication] openURL:url];
+    } else { // handle any custom schemes to plugins
+        [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:CDVPluginHandleOpenURLNotification object:url]];
+    }
 }

 // This is a helper method for the inject{Script|Style}{Code|File} API calls, which
@@ -433,14 +390,7 @@
            [self.commandDelegate sendPluginResult:pluginResult callbackId:scriptCallbackId];
            return NO;
        }
-    }
-    //if is an app store link, let the system handle it, otherwise it fails to load it
-    else if ([[ url scheme] isEqualToString:@"itms-appss"] || [[ url scheme] isEqualToString:@"itms-apps"]) {
-        [theWebView stopLoading];
-        [self openInSystem:url];
-        return NO;
-    }
-    else if ((self.callbackId != nil) && isTopLevelNavigation) {
+    } else if ((self.callbackId != nil) && isTopLevelNavigation) {
        // Send a loadstart event for each top-level navigation (includes redirects).
        CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
                                                      messageAsDictionary:@{@"type":@"loadstart", @"url":[url absoluteString]}];
@@ -524,7 +474,7 @@
 #else
        _webViewDelegate = [[CDVWebViewDelegate alloc] initWithDelegate:self];
 #endif
-
+        
        [self createViews];
    }

@@ -798,10 +748,6 @@
    return UIStatusBarStyleDefault;
 }

- (BOOL)prefersStatusBarHidden {
-    return NO;
-}
-
 - (void)close
 {
    [CDVUserAgentUtil releaseLock:&_userAgentLockToken];
@@ -1041,38 +987,19 @@

@implementation CDVInAppBrowserNavigationController : UINavigationController

- (void) dismissViewControllerAnimated:(BOOL)flag completion:(void (^)(void))completion {
-    if ( self.presentedViewController) {
-        [super dismissViewControllerAnimated:flag completion:completion];
-    }
-}
-
 - (void) viewDidLoad {

-    CGRect statusBarFrame = [self invertFrameIfNeeded:[UIApplication sharedApplication].statusBarFrame];
-    statusBarFrame.size.height = STATUSBAR_HEIGHT;
+    CGRect frame = [UIApplication sharedApplication].statusBarFrame;
+
    // simplified from: http://stackoverflow.com/a/25669695/219684

-    UIToolbar* bgToolbar = [[UIToolbar alloc] initWithFrame:statusBarFrame];
+    UIToolbar* bgToolbar = [[UIToolbar alloc] initWithFrame:frame];
    bgToolbar.barStyle = UIBarStyleDefault;
-    [bgToolbar setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
    [self.view addSubview:bgToolbar];

    [super viewDidLoad];
 }

- (CGRect) invertFrameIfNeeded:(CGRect)rect {
-    // We need to invert since on iOS 7 frames are always in Portrait context
-    if (!IsAtLeastiOSVersion(@"8.0")) {
-        if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation])) {
-            CGFloat temp = rect.size.width;
-            rect.size.width = rect.size.height;
-            rect.size.height = temp;
-        }
-        rect.origin = CGPointZero;
-    }
-    return rect;
-}

 #pragma mark CDVScreenOrientationDelegate

--- a/src/osx/CDVInAppBrowser.h
+++ b/src/osx/CDVInAppBrowser.h
@@ -1,30 +0,0 @@
-/*
- 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.
- */
-
-#import <Cordova/CDVPlugin.h>
-
-@interface CDVInAppBrowser : CDVPlugin {
-}
-
-@property (nonatomic, copy) NSString* callbackId;
-
- (void)open:(CDVInvokedUrlCommand*)command;
-
-@end
-
--- a/src/osx/CDVInAppBrowser.m
+++ b/src/osx/CDVInAppBrowser.m
@@ -1,89 +0,0 @@
-/*
- 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.
- */
-
-#import "CDVInAppBrowser.h"
-#import <Cordova/CDVPluginResult.h>
-
-#define    kInAppBrowserTargetSelf @"_self"
-#define    kInAppBrowserTargetSystem @"_system"
-#define    kInAppBrowserTargetBlank @"_blank"
-
-@interface CDVInAppBrowser () {
-}
-@end
-
-@implementation CDVInAppBrowser
-
- (void)pluginInitialize
-{
-}
-
- (BOOL) isSystemUrl:(NSURL*)url
-{
-    if ([[url host] isEqualToString:@"itunes.apple.com"]) {
-        return YES;
-    }
-
-    return NO;
-}
-
- (void)open:(CDVInvokedUrlCommand*)command
-{
-    CDVPluginResult* pluginResult;
-
-    NSString* url = [command argumentAtIndex:0];
-    NSString* target = [command argumentAtIndex:1 withDefault:kInAppBrowserTargetSelf];
-
-    self.callbackId = command.callbackId;
-
-    if (url != nil) {
-
-        NSURL* baseUrl = [NSURL URLWithString:url];
-
-        NSURL* absoluteUrl = [[NSURL URLWithString:url relativeToURL:baseUrl] absoluteURL];
-
-        if ([self isSystemUrl:absoluteUrl]) {
-            target = kInAppBrowserTargetSystem;
-        }
-
-        if ([target isEqualToString:kInAppBrowserTargetSelf]) {
-            //[self openInCordovaWebView:absoluteUrl withOptions:options];
-            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Not Yet Implemented for OSX: [self openInCordovaWebView:absoluteUrl withOptions:options]"];
-        } else if ([target isEqualToString:kInAppBrowserTargetSystem]) {
-            [self openInSystem:absoluteUrl];
-            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
-        } else { // _blank or anything else
-            //[self openInInAppBrowser:absoluteUrl withOptions:options];
-            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Not Yet Implemented for OSX: [self openInInAppBrowser:absoluteUrl withOptions:options]"];
-        }
-
-    } else {
-        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"incorrect number of arguments"];
-    }
-    [pluginResult setKeepCallback:[NSNumber numberWithBool:YES]];
-    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-}
-
- (void)openInSystem:(NSURL*)url
-{
-    [[NSWorkspace sharedWorkspace] openURL:url];
-}
-
-@end
-
--- a/src/ubuntu/InAppBrowser_escapeScript.js
+++ b/src/ubuntu/InAppBrowser_escapeScript.js
@@ -19,9 +19,6 @@
 *
 */

-/* jshint -W061 */
-/* global oxide */
-
 oxide.addMessageHandler("EXECUTE", function(msg) {
    var code = msg.args.code;
    try {
--- a/src/ubuntu/inappbrowser.cpp
+++ b/src/ubuntu/inappbrowser.cpp
@@ -65,10 +65,6 @@ void Inappbrowser::show(int, int) {
    m_cordova->execQML("CordovaWrapper.global.inappbrowser.visible = true");
 }

-void Inappbrowser::hide(int, int) {
-    m_cordova->execQML("CordovaWrapper.global.inappbrowser.visible = false");
-}
-
 void Inappbrowser::close(int, int) {
    m_cordova->execQML("CordovaWrapper.global.inappbrowser.destroy()");
    this->callbackWithoutRemove(_eventCb, EXIT_EVENT);
--- a/src/ubuntu/inappbrowser.h
+++ b/src/ubuntu/inappbrowser.h
@@ -46,7 +46,6 @@ public:
 public slots:
    void open(int cb, int, const QString &url, const QString &windowName, const QString &windowFeatures);
    void show(int, int);
-    void hide(int, int);
    void close(int, int);
    void injectStyleFile(int cb, int, const QString&, bool);
    void injectStyleCode(int cb, int, const QString&, bool);
--- a/src/windows/InAppBrowserProxy.js
+++ b/src/windows/InAppBrowserProxy.js
@@ -19,10 +19,13 @@
 *
 */

-/* jslint sloppy:true */
-/* global Windows:true, setImmediate */
+/*jslint sloppy:true */
+/*global Windows:true, require, document, setTimeout, window, module */
+
+

 var cordova = require('cordova'),
+    channel = require('cordova/channel'),
    urlutil = require('cordova/urlutil');

 var browserWrap,
@@ -32,13 +35,11 @@ var browserWrap,
    backButton,
    forwardButton,
    closeButton,
-    bodyOverflowStyle,
-    navigationEventsCallback,
-    hardwareBackCallback;
+    bodyOverflowStyle;

 // x-ms-webview is available starting from Windows 8.1 (platformId is 'windows')
 // http://msdn.microsoft.com/en-us/library/windows/apps/dn301831.aspx
-var isWebViewAvailable = cordova.platformId === 'windows';
+var isWebViewAvailable = cordova.platformId == 'windows';

 function attachNavigationEvents(element, callback) {
    if (isWebViewAvailable) {
@@ -47,21 +48,17 @@ function attachNavigationEvents(element, callback) {
        });

        element.addEventListener("MSWebViewNavigationCompleted", function (e) {
-            if (e.isSuccess) {
-                callback({ type: "loadstop", url: e.uri }, { keepCallback: true });
-            } else {
-                callback({ type: "loaderror", url: e.uri, code: e.webErrorStatus, message: "Navigation failed with error code " + e.webErrorStatus}, { keepCallback: true });
-            }
+            callback({ type: e.isSuccess ? "loadstop" : "loaderror", url: e.uri}, {keepCallback: true});
        });

        element.addEventListener("MSWebViewUnviewableContentIdentified", function (e) {
            // WebView found the content to be not HTML.
            // http://msdn.microsoft.com/en-us/library/windows/apps/dn609716.aspx
-            callback({ type: "loaderror", url: e.uri, code: e.webErrorStatus, message: "Navigation failed with error code " + e.webErrorStatus}, { keepCallback: true });
+            callback({ type: "loaderror", url: e.uri}, {keepCallback: true});
        });

        element.addEventListener("MSWebViewContentLoading", function (e) {
-            if (navigationButtonsDiv && popup) {
+            if (navigationButtonsDiv) {
                if (popup.canGoBack) {
                    backButton.removeAttribute("disabled");
                } else {
@@ -95,273 +92,209 @@ function attachNavigationEvents(element, callback) {

 var IAB = {
    close: function (win, lose) {
-        setImmediate(function () {
-            if (browserWrap) {
-                if (navigationEventsCallback) {
-                    navigationEventsCallback({ type: "exit" });
-                }
+        if (browserWrap) {
+            if (win) win({ type: "exit" });

-                browserWrap.parentNode.removeChild(browserWrap);
-                // Reset body overflow style to initial value
-                document.body.style.msOverflowStyle = bodyOverflowStyle;
-                browserWrap = null;
-                popup = null;
-
-                document.removeEventListener("backbutton", hardwareBackCallback, false);
-            }
-        });
+            browserWrap.parentNode.removeChild(browserWrap);
+            // Reset body overflow style to initial value
+            document.body.style.msOverflowStyle = bodyOverflowStyle;
+            browserWrap = null;
+            popup = null;
+        }
    },
    show: function (win, lose) {
-        setImmediate(function () {
-            if (browserWrap) {
-                browserWrap.style.display = "block";
-            }
-        });
-    },
-    hide: function (win, lose) {
        if (browserWrap) {
-            browserWrap.style.display = "none";
+            browserWrap.style.display = "block";
        }
    },
    open: function (win, lose, args) {
-        // make function async so that we can add navigation events handlers before view is loaded and navigation occured
-        setImmediate(function () {
-            var strUrl = args[0],
-                target = args[1],
-                features = args[2],
-                url;
+        var strUrl = args[0],
+            target = args[1],
+            features = args[2],
+            url;

-            navigationEventsCallback = win;
+        if (target === "_system") {
+            url = new Windows.Foundation.Uri(strUrl);
+            Windows.System.Launcher.launchUriAsync(url);
+        } else if (target === "_self" || !target) {
+            window.location = strUrl;
+        } else {
+            // "_blank" or anything else
+            if (!browserWrap) {
+                var browserWrapStyle = document.createElement('link');
+                browserWrapStyle.rel = "stylesheet";
+                browserWrapStyle.type = "text/css";
+                browserWrapStyle.href = urlutil.makeAbsolute("/www/css/inappbrowser.css");

-            if (target === "_system") {
-                url = new Windows.Foundation.Uri(strUrl);
-                Windows.System.Launcher.launchUriAsync(url);
-            } else if (target === "_self" || !target) {
-                window.location = strUrl;
-            } else {
-                // "_blank" or anything else
-                if (!browserWrap) {
-                    var browserWrapStyle = document.createElement('link');
-                    browserWrapStyle.rel = "stylesheet";
-                    browserWrapStyle.type = "text/css";
-                    browserWrapStyle.href = urlutil.makeAbsolute("/www/css/inappbrowser.css");
+                document.head.appendChild(browserWrapStyle);

-                    document.head.appendChild(browserWrapStyle);
+                browserWrap = document.createElement("div");
+                browserWrap.className = "inAppBrowserWrap";

-                    browserWrap = document.createElement("div");
-                    browserWrap.className = "inAppBrowserWrap";
-
-                    if (features.indexOf("fullscreen=yes") > -1) {
-                        browserWrap.classList.add("inAppBrowserWrapFullscreen");
-                    }
-
-                    // Save body overflow style to be able to reset it back later
-                    bodyOverflowStyle = document.body.style.msOverflowStyle;
-
-                    browserWrap.onclick = function () {
-                        setTimeout(function () {
-                            IAB.close(navigationEventsCallback);
-                        }, 0);
-                    };
-
-                    document.body.appendChild(browserWrap);
-                    // Hide scrollbars for the whole body while inappbrowser's window is open
-                    document.body.style.msOverflowStyle = "none";
+                if (features.indexOf("fullscreen=yes") > -1) {
+                    browserWrap.classList.add("inAppBrowserWrapFullscreen");
                }

-                if (features.indexOf("hidden=yes") !== -1) {
-                    browserWrap.style.display = "none";
-                }
+                // Save body overflow style to be able to reset it back later
+                bodyOverflowStyle = document.body.style.msOverflowStyle;

-                popup = document.createElement(isWebViewAvailable ? "x-ms-webview" : "iframe");
-                if (popup instanceof HTMLIFrameElement) {
-                    // For iframe we need to override bacground color of parent element here
-                    // otherwise pages without background color set will have transparent background
-                    popup.style.backgroundColor = "white";
-                }
-                popup.style.borderWidth = "0px";
-                popup.style.width = "100%";
-                popup.style.marginBottom = "-5px";
-
-                browserWrap.appendChild(popup);
-
-                var closeHandler = function (e) {
+                browserWrap.onclick = function () {
                    setTimeout(function () {
-                        IAB.close(navigationEventsCallback);
+                        IAB.close(win);
                    }, 0);
                };

-                if (features.indexOf("hardwareback=yes") > -1 || features.indexOf("hardwareback") === -1) {
-                    hardwareBackCallback = function () {
-                        if (browserWrap.style.display === 'none') {
-                            // NOTE: backbutton handlers have to throw an exception in order to prevent
-                            // returning 'true' inside cordova-js, which would mean that the event is handled by user.
-                            // Throwing an exception means that the default/system navigation behavior will take place,
-                            // which is to exit the app if the navigation stack is empty.
-                            throw 'Exit the app';
-                        }
-
-                        if (popup.canGoBack) {
-                            popup.goBack();
-                        } else {
-                            closeHandler();
-                        }
-                    };
-                } else if (features.indexOf("hardwareback=no") > -1) {
-                    hardwareBackCallback = function () {
-                        if (browserWrap.style.display === 'none') {
-                            // See comment above
-                            throw 'Exit the app';
-                        }
-
-                        closeHandler();
-                    };
-                }
-
-                document.addEventListener("backbutton", hardwareBackCallback, false);
-
-                if (features.indexOf("location=yes") !== -1 || features.indexOf("location") === -1) {
-                    popup.style.height = "calc(100% - 70px)";
-
-                    navigationButtonsDiv = document.createElement("div");
-                    navigationButtonsDiv.className = "inappbrowser-app-bar";
-                    navigationButtonsDiv.onclick = function (e) {
-                        e.cancelBubble = true;
-                    };
-
-                    navigationButtonsDivInner = document.createElement("div");
-                    navigationButtonsDivInner.className = "inappbrowser-app-bar-inner";
-                    navigationButtonsDivInner.onclick = function (e) {
-                        e.cancelBubble = true;
-                    };
-
-                    backButton = document.createElement("div");
-                    backButton.innerText = "back";
-                    backButton.className = "app-bar-action action-back";
-                    backButton.addEventListener("click", function (e) {
-                        if (popup.canGoBack)
-                            popup.goBack();
-                    });
-
-                    forwardButton = document.createElement("div");
-                    forwardButton.innerText = "forward";
-                    forwardButton.className = "app-bar-action action-forward";
-                    forwardButton.addEventListener("click", function (e) {
-                        if (popup.canGoForward)
-                            popup.goForward();
-                    });
-
-                    closeButton = document.createElement("div");
-                    closeButton.innerText = "close";
-                    closeButton.className = "app-bar-action action-close";
-                    closeButton.addEventListener("click", closeHandler);
-
-                    if (!isWebViewAvailable) {
-                        // iframe navigation is not yet supported
-                        backButton.setAttribute("disabled", "true");
-                        forwardButton.setAttribute("disabled", "true");
-                    }
-
-                    navigationButtonsDivInner.appendChild(backButton);
-                    navigationButtonsDivInner.appendChild(forwardButton);
-                    navigationButtonsDivInner.appendChild(closeButton);
-                    navigationButtonsDiv.appendChild(navigationButtonsDivInner);
-
-                    browserWrap.appendChild(navigationButtonsDiv);
-                } else {
-                    popup.style.height = "100%";
-                }
-
-                // start listening for navigation events
-                attachNavigationEvents(popup, navigationEventsCallback);
-
-                if (isWebViewAvailable) {
-                    strUrl = strUrl.replace("ms-appx://", "ms-appx-web://");
-                }
-                popup.src = strUrl;
+                document.body.appendChild(browserWrap);
+                // Hide scrollbars for the whole body while inappbrowser's window is open
+                document.body.style.msOverflowStyle = "none";
            }
-        });
+
+            if (features.indexOf("hidden=yes") !== -1) {
+                browserWrap.style.display = "none";
+            }
+
+            popup = document.createElement(isWebViewAvailable ? "x-ms-webview" : "iframe");
+            if (popup instanceof HTMLIFrameElement) {
+                // For iframe we need to override bacground color of parent element here
+                // otherwise pages without background color set will have transparent background
+                popup.style.backgroundColor = "white";
+            }
+            popup.style.borderWidth = "0px";
+            popup.style.width = "100%";
+
+            browserWrap.appendChild(popup);
+
+            if (features.indexOf("location=yes") !== -1 || features.indexOf("location") === -1) {
+                popup.style.height = "calc(100% - 70px)";
+
+                navigationButtonsDiv = document.createElement("div");
+                navigationButtonsDiv.className = "inappbrowser-app-bar";
+                navigationButtonsDiv.onclick = function (e) {
+                    e.cancelBubble = true;
+                };
+
+                navigationButtonsDivInner = document.createElement("div");
+                navigationButtonsDivInner.className = "inappbrowser-app-bar-inner"
+                navigationButtonsDivInner.onclick = function (e) {
+                    e.cancelBubble = true;
+                };
+
+                backButton = document.createElement("div");
+                backButton.innerText = "back";
+                backButton.className = "app-bar-action action-back";
+                backButton.addEventListener("click", function (e) {
+                    if (popup.canGoBack)
+                        popup.goBack();
+                });
+
+                forwardButton = document.createElement("div");
+                forwardButton.innerText = "forward";
+                forwardButton.className = "app-bar-action action-forward";
+                forwardButton.addEventListener("click", function (e) {
+                    if (popup.canGoForward)
+                        popup.goForward();
+                });
+
+                closeButton = document.createElement("div");
+                closeButton.innerText = "close";
+                closeButton.className = "app-bar-action action-close";
+                closeButton.addEventListener("click", function (e) {
+                    setTimeout(function () {
+                        IAB.close(win);
+                    }, 0);
+                });
+
+                if (!isWebViewAvailable) {
+                    // iframe navigation is not yet supported
+                    backButton.setAttribute("disabled", "true");
+                    forwardButton.setAttribute("disabled", "true");
+                }
+
+                navigationButtonsDivInner.appendChild(backButton);
+                navigationButtonsDivInner.appendChild(forwardButton);
+                navigationButtonsDivInner.appendChild(closeButton);
+                navigationButtonsDiv.appendChild(navigationButtonsDivInner);
+
+                browserWrap.appendChild(navigationButtonsDiv);
+            } else {
+                popup.style.height = "100%";
+            }
+
+            // start listening for navigation events
+            attachNavigationEvents(popup, win);
+
+            if (isWebViewAvailable) {
+                strUrl = strUrl.replace("ms-appx://", "ms-appx-web://");
+            }
+            popup.src = strUrl;
+        }
    },

    injectScriptCode: function (win, fail, args) {
-        setImmediate(function () {
-            var code = args[0],
-                hasCallback = args[1];
+        var code = args[0],
+            hasCallback = args[1];

-            if (isWebViewAvailable && browserWrap && popup) {
-                var op = popup.invokeScriptAsync("eval", code);
-                op.oncomplete = function (e) {
-                    if (hasCallback) {
-                        // return null if event target is unavailable by some reason
-                        var result = (e && e.target) ? [e.target.result] : [null];
-                        win(result);
-                    }
-                };
-                op.onerror = function () { };
-                op.start();
-            }
-        });
+        if (isWebViewAvailable && browserWrap && popup) {
+            var op = popup.invokeScriptAsync("eval", code);
+            op.oncomplete = function (e) {
+                // return null if event target is unavailable by some reason
+                var result = (e && e.target) ? [e.target.result] : [null];
+                hasCallback && win(result);
+            };
+            op.onerror = function () { };
+            op.start();
+        }
    },

    injectScriptFile: function (win, fail, args) {
-        setImmediate(function () {
-            var filePath = args[0],
-                hasCallback = args[1];
+        var filePath = args[0],
+            hasCallback = args[1];

-            if (!!filePath) {
-                filePath = urlutil.makeAbsolute(filePath);
-            }
+        if (!!filePath) {
+            filePath = urlutil.makeAbsolute(filePath);
+        }

-            if (isWebViewAvailable && browserWrap && popup) {
-                // CB-12364 getFileFromApplicationUriAsync does not support ms-appx-web
-                var uri = new Windows.Foundation.Uri(filePath.replace('ms-appx-web:', 'ms-appx:'));
-                Windows.Storage.StorageFile.getFileFromApplicationUriAsync(uri).done(function (file) {
-                    Windows.Storage.FileIO.readTextAsync(file).done(function (code) {
-                        var op = popup.invokeScriptAsync("eval", code);
-                        op.oncomplete = function(e) {
-                            if (hasCallback) {
-                                var result = [e.target.result];
-                                win(result);
-                            }
-                        };
-                        op.onerror = function () { };
-                        op.start();
-                    });
+        if (isWebViewAvailable && browserWrap && popup) {
+            var uri = new Windows.Foundation.Uri(filePath);
+            Windows.Storage.StorageFile.getFileFromApplicationUriAsync(uri).done(function (file) {
+                Windows.Storage.FileIO.readTextAsync(file).done(function (code) {
+                    var op = popup.invokeScriptAsync("eval", code);
+                    op.oncomplete = function(e) {
+                        var result = [e.target.result];
+                        hasCallback && win(result);
+                    };
+                    op.onerror = function () { };
+                    op.start();
                });
-            }
-        });
+            });
+        }
    },

    injectStyleCode: function (win, fail, args) {
-        setImmediate(function () {
-            var code = args[0],
-                hasCallback = args[1];
+        var code = args[0],
+            hasCallback = args[1];

-            if (isWebViewAvailable && browserWrap && popup) {
-                injectCSS(popup, code, hasCallback && win);
-            }
-        });
+        if (isWebViewAvailable && browserWrap && popup) {
+            injectCSS(popup, code, hasCallback && win);
+        }
    },

    injectStyleFile: function (win, fail, args) {
-        setImmediate(function () {
-            var filePath = args[0],
-                hasCallback = args[1];
+        var filePath = args[0],
+            hasCallback = args[1];

-            filePath = filePath && urlutil.makeAbsolute(filePath);
+        filePath = filePath && urlutil.makeAbsolute(filePath);

-            if (isWebViewAvailable && browserWrap && popup) {
-                // CB-12364 getFileFromApplicationUriAsync does not support ms-appx-web
-                var uri = new Windows.Foundation.Uri(filePath.replace('ms-appx-web:', 'ms-appx:'));
-                Windows.Storage.StorageFile.getFileFromApplicationUriAsync(uri).then(function (file) {
-                    return Windows.Storage.FileIO.readTextAsync(file);
-                }).done(function (code) {
-                    injectCSS(popup, code, hasCallback && win);
-                }, function () {
-                    // no-op, just catch an error
-                });
-            }
-        });
+        if (isWebViewAvailable && browserWrap && popup) {
+            var uri = new Windows.Foundation.Uri(filePath);
+            Windows.Storage.StorageFile.getFileFromApplicationUriAsync(uri).then(function (file) {
+                return Windows.Storage.FileIO.readTextAsync(file);
+            }).done(function (code) {
+                injectCSS(popup, code, hasCallback && win);
+            }, function () {
+                // no-op, just catch an error
+            });
+        }
    }
 };

@@ -373,9 +306,7 @@ function injectCSS (webView, cssCode, callback) {

    var op = webView.invokeScriptAsync("eval", evalWrapper);
    op.oncomplete = function() {
-        if (callback) {
-            callback([]);
-        }
+        callback && callback([]);
    };
    op.onerror = function () { };
    op.start();
--- a/src/wp/InAppBrowser.cs
+++ b/src/wp/InAppBrowser.cs
@@ -131,21 +131,6 @@ namespace WPCordovaClassLib.Cordova.Commands
            }
        }

-        public void hide(string options)
-        {
-            string[] args = JSON.JsonHelper.Deserialize<string[]>(options);
-
-
-            if (browser != null)
-            {
-                Deployment.Current.Dispatcher.BeginInvoke(() =>
-                {
-                    browser.Visibility = Visibility.Collapsed;
-                    AppBar.IsVisible = false;
-                });
-            }
-        }
-
        public void injectScriptCode(string options)
        {
            string[] args = JSON.JsonHelper.Deserialize<string[]>(options);
--- a/tests/package.json
+++ b/tests/package.json
@@ -1,14 +0,0 @@
-{
-  "name": "cordova-plugin-inappbrowser-tests",
-  "version": "1.7.1-dev",
-  "description": "",
-  "cordova": {
-    "id": "cordova-plugin-inappbrowser-tests",
-    "platforms": []
-  },
-  "keywords": [
-    "ecosystem:cordova"
-  ],
-  "author": "",
-  "license": "Apache 2.0"
-}
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -20,12 +20,10 @@

 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
    id="cordova-plugin-inappbrowser-tests"
-    version="1.7.1">
+    version="1.2.1-dev">
    <name>Cordova InAppBrowser Plugin Tests</name>
    <license>Apache 2.0</license>

-    <dependency id="cordova-plugin-dialogs" />
-
    <js-module src="tests.js" name="tests">
    </js-module>

--- a/tests/resources/inject.js
+++ b/tests/resources/inject.js
@@ -16,5 +16,5 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-var d = document.getElementById("header");
+var d = document.getElementById("header")
 d.innerHTML = "Script file successfully injected";
--- a/tests/resources/video.html
+++ b/tests/resources/video.html
@@ -38,8 +38,5 @@
      <button onclick="document.getElementById('player').play()"> play </button>
      <button onclick="document.getElementById('player').pause()"> pause </button>
    </div>
-    <script>
-      document.getElementById('player').play();
-    </script>
  </body>
 </html>
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -19,17 +19,10 @@
 *
 */

-/* jshint jasmine: true */
-/* global MSApp */
-
 var cordova = require('cordova');
 var isWindows = cordova.platformId == 'windows';

 window.alert = window.alert || navigator.notification.alert;
-if (isWindows && navigator && navigator.notification && navigator.notification.alert) {
-    // window.alert is defined but not functional on UWP
-    window.alert = navigator.notification.alert;
-}

 exports.defineAutoTests = function () {

@@ -41,70 +34,50 @@ exports.defineAutoTests = function () {

        it("inappbrowser.spec.2 should contain open function", function () {
            expect(cordova.InAppBrowser.open).toBeDefined();
-            expect(cordova.InAppBrowser.open).toEqual(jasmine.any(Function));
+            expect(typeof cordova.InAppBrowser.open === 'function').toBe(true);
        });
    });

    describe('open method', function () {

-        if (cordova.platformId == 'osx') {
-            pending('Open method not fully supported on OSX.');
-            return;
-        }
-
-        var iabInstance;
+        var iabInsance;
        var originalTimeout;
-        var url = 'https://dist.apache.org/repos/dist/dev/cordova/';
-        var badUrl = 'http://bad-uri/';
+        var url = 'http://apache.org/';

        beforeEach(function () {
            // increase timeout to ensure test url could be loaded within test time
            originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
-            jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;
+            jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;

-            iabInstance = null;
+            iabInsance = null;
        });

-        afterEach(function (done) {
+        afterEach(function () {
            // restore original timeout
            jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;

-            if (iabInstance !== null && iabInstance.close) {
-                iabInstance.close();
+            if (iabInsance && iabInsance.close) {
+                iabInsance.close();
            }
-            iabInstance = null;
-            // add some extra time so that iab dialog is closed
-            setTimeout(done, 2000);
+            iabInsance = null;
        });

        function verifyEvent(evt, type) {
            expect(evt).toBeDefined();
            expect(evt.type).toEqual(type);
-            if (type !== 'exit') { // `exit` event does not have url field
-                expect(evt.url).toEqual(url);
-            }
+            expect(evt.url).toEqual(url);
        }

-        function verifyLoadErrorEvent(evt) {
-            expect(evt).toBeDefined();
-            expect(evt.type).toEqual('loaderror');
-            expect(evt.url).toEqual(badUrl);
-            expect(evt.code).toEqual(jasmine.any(Number));
-            expect(evt.message).toEqual(jasmine.any(String));
-        }
+        it("inappbrowser.spec.3 should retun InAppBrowser class instance", function () {
+            iabInsance = cordova.InAppBrowser.open(url, '_blank');

-        it("inappbrowser.spec.3 should retun InAppBrowser instance with required methods", function () {
-            iabInstance = cordova.InAppBrowser.open(url, '_blank');
+            expect(iabInsance).toBeDefined();

-            expect(iabInstance).toBeDefined();
+            expect(iabInsance.addEventListener).toBeDefined();
+            expect(typeof iabInsance.addEventListener === 'function').toBe(true);
+            expect(iabInsance.close).toBeDefined();
+            expect(typeof iabInsance.close === 'function').toBe(true);

-            expect(iabInstance.addEventListener).toEqual(jasmine.any(Function));
-            expect(iabInstance.removeEventListener).toEqual(jasmine.any(Function));
-            expect(iabInstance.close).toEqual(jasmine.any(Function));
-            expect(iabInstance.show).toEqual(jasmine.any(Function));
-            expect(iabInstance.hide).toEqual(jasmine.any(Function));
-            expect(iabInstance.executeScript).toEqual(jasmine.any(Function));
-            expect(iabInstance.insertCSS).toEqual(jasmine.any(Function));
        });

        it("inappbrowser.spec.4 should support loadstart and loadstop events", function (done) {
@@ -112,32 +85,14 @@ exports.defineAutoTests = function () {
                verifyEvent(evt, 'loadstart');
            });

-            iabInstance = cordova.InAppBrowser.open(url, '_blank');
-            iabInstance.addEventListener('loadstart', onLoadStart);
-            iabInstance.addEventListener('loadstop', function (evt) {
+            iabInsance = cordova.InAppBrowser.open(url, '_blank');
+            iabInsance.addEventListener('loadstart', onLoadStart);
+            iabInsance.addEventListener('loadstop', function (evt) {
                verifyEvent(evt, 'loadstop');
                expect(onLoadStart).toHaveBeenCalled();
                done();
            });
        });
-
-        it("inappbrowser.spec.5 should support exit event", function (done) {
-            iabInstance = cordova.InAppBrowser.open(url, '_blank');
-            iabInstance.addEventListener('exit', function (evt) {
-                verifyEvent(evt, 'exit');
-                done();
-            });
-            iabInstance.close();
-            iabInstance = null;
-        });
-
-        it("inappbrowser.spec.6 should support loaderror event", function (done) {
-            iabInstance = cordova.InAppBrowser.open(badUrl, '_blank');
-            iabInstance.addEventListener('loaderror', function (evt) {
-                verifyLoadErrorEvent(evt);
-                done();
-            });
-        });
    });
 };

@@ -196,13 +151,13 @@ exports.defineManualTests = function (contentEl, createActionButton) {
                if (e.url != lastLoadStartURL) {
                    alert('Unexpected: ' + e.type + ' event.url != loadstart\'s event.url');
                }
-                if (numExpectedRedirects === 0 && counts.loadstart !== 1) {
+                if (numExpectedRedirects === 0 && counts['loadstart'] !== 1) {
                    // Do allow a loaderror without a loadstart (e.g. in the case of an invalid URL).
-                    if (!(e.type == 'loaderror' && counts.loadstart === 0)) {
-                        alert('Unexpected: got multiple loadstart events. (' + counts.loadstart + ')');
+                    if (!(e.type == 'loaderror' && counts['loadstart'] === 0)) {
+                        alert('Unexpected: got multiple loadstart events. (' + counts['loadstart'] + ')');
                    }
-                } else if (numExpectedRedirects > 0 && counts.loadstart < (numExpectedRedirects + 1)) {
-                    alert('Unexpected: should have got at least ' + (numExpectedRedirects + 1) + ' loadstart events, but got ' + counts.loadstart);
+                } else if (numExpectedRedirects > 0 && counts['loadstart'] < (numExpectedRedirects + 1)) {
+                    alert('Unexpected: should have got at least ' + (numExpectedRedirects + 1) + ' loadstart events, but got ' + counts['loadstart']);
                }
                wasReset = true;
                numExpectedRedirects = 0;
@@ -210,7 +165,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
            }
            // Verify that loadend / loaderror was called.
            if (e.type == 'exit') {
-                var numStopEvents = counts.loadstop + counts.loaderror;
+                var numStopEvents = counts['loadstop'] + counts['loaderror'];
                if (numStopEvents === 0 && !wasReset) {
                    alert('Unexpected: browser closed without a loadstop or loaderror.');
                } else if (numStopEvents > 1) {
@@ -426,9 +381,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
        '<p/> <div id="closeHidden"></div>' +
        'Expected result: no output. But click on "show hidden" again and nothing should be shown.' +
        '<p/> <div id="openHiddenShow"></div>' +
-        'Expected result: open successfully in InAppBrowser to https://www.google.co.uk' +
-        '<p/> <div id="openVisibleAndHide"></div>' +
-        'Expected result: open successfully in InAppBrowser to https://www.google.co.uk. Hide after 2 seconds';
+        'Expected result: open successfully in InAppBrowser to https://www.google.co.uk';

    var clearing_cache_tests = '<h1>Clearing Cache</h1>' +
        '<div id="openClearCache"></div>' +
@@ -438,11 +391,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {

    var video_tag_tests = '<h1>Video tag</h1>' +
        '<div id="openRemoteVideo"></div>' +
-        'Expected result: open successfully in InAppBrowser with an embedded video plays automatically on iOS and Android.' +
-        '<div id="openRemoteNeedUserNoVideo"></div>' +
-        'Expected result: open successfully in InAppBrowser with an embedded video plays automatically on iOS and Android.' +
-        '<div id="openRemoteNeedUserYesVideo"></div>' +
-        'Expected result: open successfully in InAppBrowser with an embedded video does not play automatically on iOS and Android but rather works after clicking the "play" button.';
+        'Expected result: open successfully in InAppBrowser with an embedded video that works after clicking the "play" button.';

    var local_with_anchor_tag_tests = '<h1>Local with anchor tag</h1>' +
        '<div id="openAnchor1"></div>' +
@@ -450,26 +399,16 @@ exports.defineManualTests = function (contentEl, createActionButton) {
        '<p/> <div id="openAnchor2"></div>' +
        'Expected result: open successfully in InAppBrowser to the local page, scrolled to the beginning of the tall div with border.';

-    var hardwareback_tests = '<h1>HardwareBack</h1>' +
-        '<p/> <div id="openHardwareBackDefault"></div>' +
-        'Expected result: By default hardwareback is yes so pressing back button should navigate backwards in history then close InAppBrowser' +
-        '<p/> <div id="openHardwareBackYes"></div>' +
-        'Expected result: hardwareback=yes pressing back button should navigate backwards in history then close InAppBrowser' +
-        '<p/> <div id="openHardwareBackNo"></div>' +
-        'Expected result: hardwareback=no pressing back button should close InAppBrowser regardless history' + 
-        '<p/> <div id="openHardwareBackDefaultAfterNo"></div>' +
-        'Expected result: consistently open browsers with with the appropriate option: hardwareback=defaults to yes then hardwareback=no then hardwareback=defaults to yes. By default hardwareback is yes so pressing back button should navigate backwards in history then close InAppBrowser';
-
    // CB-7490 We need to wrap this code due to Windows security restrictions
    // see http://msdn.microsoft.com/en-us/library/windows/apps/hh465380.aspx#differences for details
    if (window.MSApp && window.MSApp.execUnsafeLocalFunction) {
        MSApp.execUnsafeLocalFunction(function() {
            contentEl.innerHTML = info_div + local_tests + white_listed_tests + non_white_listed_tests + page_with_redirects_tests + pdf_url_tests + invalid_url_tests +
-                css_js_injection_tests + open_hidden_tests + clearing_cache_tests + video_tag_tests + local_with_anchor_tag_tests + hardwareback_tests;
+                css_js_injection_tests + open_hidden_tests + clearing_cache_tests + video_tag_tests + local_with_anchor_tag_tests;
        });
    } else {
        contentEl.innerHTML = info_div + local_tests + white_listed_tests + non_white_listed_tests + page_with_redirects_tests + pdf_url_tests + invalid_url_tests +
-            css_js_injection_tests + open_hidden_tests + clearing_cache_tests + video_tag_tests + local_with_anchor_tag_tests + hardwareback_tests;
+            css_js_injection_tests + open_hidden_tests + clearing_cache_tests + video_tag_tests + local_with_anchor_tag_tests;
    }

    document.getElementById("user-agent").textContent = navigator.userAgent;
@@ -627,12 +566,6 @@ exports.defineManualTests = function (contentEl, createActionButton) {
    createActionButton('google.co.uk Not Hidden', function () {
        openHidden('https://www.google.co.uk', false);
    }, 'openHiddenShow');
-    createActionButton('google.co.uk shown for 2 seconds than hidden', function () {
-        var iab = doOpen('https://www.google.co.uk/', 'random_sting');
-        setTimeout(function () {
-            iab.hide();
-        }, 2000);
-    }, 'openVisibleAndHide');

    //Clearing cache
    createActionButton('Clear Browser Cache', function () {
@@ -646,12 +579,6 @@ exports.defineManualTests = function (contentEl, createActionButton) {
    createActionButton('Remote Video', function () {
        doOpen(videohtml, '_blank');
    }, 'openRemoteVideo');
-    createActionButton('Remote Need User No Video', function () {
-        doOpen(videohtml, '_blank', 'mediaPlaybackRequiresUserAction=no');
-    }, 'openRemoteNeedUserNoVideo');
-    createActionButton('Remote Need User Yes Video', function () {
-        doOpen(videohtml, '_blank', 'mediaPlaybackRequiresUserAction=yes');
-    }, 'openRemoteNeedUserYesVideo');

    //Local With Anchor Tag
    createActionButton('Anchor1', function () {
@@ -660,30 +587,5 @@ exports.defineManualTests = function (contentEl, createActionButton) {
    createActionButton('Anchor2', function () {
        doOpen(localhtml + '#anchor2', '_blank');
    }, 'openAnchor2');
-
-    // Hardwareback
-    createActionButton('no hardwareback (defaults to yes)', function () {
-        doOpen('http://cordova.apache.org', '_blank');
-    }, 'openHardwareBackDefault');
-    createActionButton('hardwareback=yes', function () {
-        doOpen('http://cordova.apache.org', '_blank', 'hardwareback=yes');
-    }, 'openHardwareBackYes');
-    createActionButton('hardwareback=no', function () {
-        doOpen('http://cordova.apache.org', '_blank', 'hardwareback=no');
-    }, 'openHardwareBackNo');
-    createActionButton('no hardwareback -> hardwareback=no -> no hardwareback', function() {
-        var ref = cordova.InAppBrowser.open('https://google.com', '_blank', 'location=yes');
-        ref.addEventListener('loadstop', function() {
-            ref.close();
-        });
-        ref.addEventListener('exit', function() {
-            var ref2 = cordova.InAppBrowser.open('https://google.com', '_blank', 'location=yes,hardwareback=no');
-            ref2.addEventListener('loadstop', function() {
-                ref2.close();
-            });
-            ref2.addEventListener('exit', function() {
-                cordova.InAppBrowser.open('https://google.com', '_blank', 'location=yes');
-            });
-        });
-    }, 'openHardwareBackDefaultAfterNo');
 };
+
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -1,219 +0,0 @@
-// Type definitions for Apache Cordova InAppBrowser plugin
-// Project: https://github.com/apache/cordova-plugin-inappbrowser
-// Definitions by: Microsoft Open Technologies Inc <http://msopentech.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 
-// Copyright (c) Microsoft Open Technologies Inc
-// Licensed under the MIT license.
-
-interface Window {
-    /**
-     * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
-     * @param  url     The URL to load.
-     * @param  target  The target in which to load the URL, an optional parameter that defaults to _self.
-     * @param  options Options for the InAppBrowser. Optional, defaulting to: location=yes.
-     *                 The options string must not contain any blank space, and each feature's
-     *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
-     */
-    open(url: string, target?: "_self", options?: string): InAppBrowser;
-    /**
-     * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
-     * @param  url     The URL to load.
-     * @param  target  The target in which to load the URL, an optional parameter that defaults to _self.
-     * @param  options Options for the InAppBrowser. Optional, defaulting to: location=yes.
-     *                 The options string must not contain any blank space, and each feature's
-     *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
-     */
-    open(url: string, target?: "_blank", options?: string): InAppBrowser;
-    /**
-     * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
-     * @param  url     The URL to load.
-     * @param  target  The target in which to load the URL, an optional parameter that defaults to _self.
-     * @param  options Options for the InAppBrowser. Optional, defaulting to: location=yes.
-     *                 The options string must not contain any blank space, and each feature's
-     *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
-     */
-    open(url: string, target?: "_system", options?: string): InAppBrowser;
-    /**
-     * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
-     * @param  url     The URL to load.
-     * @param  target  The target in which to load the URL, an optional parameter that defaults to _self.
-     * @param  options Options for the InAppBrowser. Optional, defaulting to: location=yes.
-     *                 The options string must not contain any blank space, and each feature's
-     *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
-     */
-    open(url: string, target?: string, options?: string, replace?: boolean): InAppBrowser;
-}
-
-/**
- * The object returned from a call to window.open.
- * NOTE: The InAppBrowser window behaves like a standard web browser, and can't access Cordova APIs.
- */
-interface InAppBrowser extends Window {
-    onloadstart: (type: InAppBrowserEvent) => void;
-    onloadstop: (type: InAppBrowserEvent) => void;
-    onloaderror: (type: InAppBrowserEvent) => void;
-    onexit: (type: InAppBrowserEvent) => void;
-    // addEventListener overloads
-    /**
-     * Adds a listener for an event from the InAppBrowser.
-     * @param type      the event to listen for
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    addEventListener(type: "loadstart", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Adds a listener for an event from the InAppBrowser.
-     * @param type      the event to listen for
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    addEventListener(type: "loadstop", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Adds a listener for an event from the InAppBrowser.
-     * @param type      the event to listen for
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    addEventListener(type: "loaderror", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Adds a listener for an event from the InAppBrowser.
-     * @param type      the event to listen for
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    addEventListener(type: "exit", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Adds a listener for an event from the InAppBrowser.
-     * @param type      the event to listen for
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an Event object as a parameter.
-     */
-    addEventListener(type: string, callback: (event: Event) => void): void;
-    // removeEventListener overloads
-    /**
-     * Removes a listener for an event from the InAppBrowser.
-     * @param type      The event to stop listening for.
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    removeEventListener(type: "loadstart", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Removes a listener for an event from the InAppBrowser.
-     * @param type      The event to stop listening for.
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    removeEventListener(type: "loadstop", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Removes a listener for an event from the InAppBrowser.
-     * @param type      The event to stop listening for.
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    removeEventListener(type: "loaderror", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Removes a listener for an event from the InAppBrowser.
-     * @param type      The event to stop listening for.
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an InAppBrowserEvent object as a parameter.
-     */
-    removeEventListener(type: "exit", callback: (event: InAppBrowserEvent) => void): void;
-    /**
-     * Removes a listener for an event from the InAppBrowser.
-     * @param type      The event to stop listening for.
-     *                  loadstart: event fires when the InAppBrowser starts to load a URL.
-     *                  loadstop: event fires when the InAppBrowser finishes loading a URL.
-     *                  loaderror: event fires when the InAppBrowser encounters an error when loading a URL.
-     *                  exit: event fires when the InAppBrowser window is closed.
-     * @param callback  the function that executes when the event fires. The function is
-     *                  passed an Event object as a parameter.
-     */
-    removeEventListener(type: string, callback: (event: Event) => void): void;
-    /** Closes the InAppBrowser window. */
-    close(): void;
-    /**
-     * Displays an InAppBrowser window that was opened hidden. Calling this has no effect
-     * if the InAppBrowser was already visible.
-     */
-    show(): void;
-    /**
-     * Injects JavaScript code into the InAppBrowser window.
-     * @param script    Details of the script to run, specifying either a file or code key.
-     * @param callback  The function that executes after the JavaScript code is injected.
-     *                  If the injected script is of type code, the callback executes with
-     *                  a single parameter, which is the return value of the script, wrapped in an Array.
-     *                  For multi-line scripts, this is the return value of the last statement,
-     *                  or the last expression evaluated.
-     */
-    executeScript(script: { code: string }, callback: (result: any) => void): void;
-    /**
-     * Injects JavaScript code into the InAppBrowser window.
-     * @param script    Details of the script to run, specifying either a file or code key.
-     * @param callback  The function that executes after the JavaScript code is injected.
-     *                  If the injected script is of type code, the callback executes with
-     *                  a single parameter, which is the return value of the script, wrapped in an Array.
-     *                  For multi-line scripts, this is the return value of the last statement,
-     *                  or the last expression evaluated.
-     */
-    executeScript(script: { file: string }, callback: (result: any) => void): void;
-    /**
-     * Injects CSS into the InAppBrowser window.
-     * @param css       Details of the script to run, specifying either a file or code key.
-     * @param callback  The function that executes after the CSS is injected.
-     */
-    insertCSS(css: { code: string }, callback: () => void): void;
-    /**
-     * Injects CSS into the InAppBrowser window.
-     * @param css       Details of the script to run, specifying either a file or code key.
-     * @param callback  The function that executes after the CSS is injected.
-     */
-    insertCSS(css: { file: string }, callback: () => void): void;
-}
-
-interface InAppBrowserEvent extends Event {
-    /** the eventname, either loadstart, loadstop, loaderror, or exit. */
-    type: string;
-    /** the URL that was loaded. */
-    url: string;
-    /** the error code, only in the case of loaderror. */
-    code: number;
-    /** the error message, only in the case of loaderror. */
-    message: string;
-}
--- a/www/inappbrowser.js
+++ b/www/inappbrowser.js
@@ -50,10 +50,7 @@
            exec(null, null, "InAppBrowser", "close", []);
        },
        show: function (eventname) {
-            exec(null, null, "InAppBrowser", "show", []);
-        },
-        hide: function (eventname) {
-            exec(null, null, "InAppBrowser", "hide", []);
+          exec(null, null, "InAppBrowser", "show", []);
        },
        addEventListener: function (eventname,f) {
            if (eventname in this.channels) {
--- a/www/windows8/InAppBrowserProxy.js
+++ b/www/windows8/InAppBrowserProxy.js
@@ -22,6 +22,10 @@
 /*jslint sloppy:true */
 /*global Windows:true, require, document, setTimeout, window, module */

+
+var cordova = require('cordova'),
+    channel = require('cordova/channel');
+
 var browserWrap;

 var IAB = {
@@ -38,15 +42,10 @@ var IAB = {

         }*/
    },
-    hide: function (win, lose) {
-        /* empty block, ran out of bacon?
-        if (browserWrap) {
-
-        }*/
-    },
    open: function (win, lose, args) {
        var strUrl = args[0],
            target = args[1],
+            features = args[2],
            url,
            elem;