From a74510ba005f53c31fbcb832ac4859fe4ff2ce8d Mon Sep 17 00:00:00 2001 From: Steve Gill Date: Tue, 28 Feb 2017 17:41:27 -0800 Subject: [PATCH 1/8] CB-12519 Updated version and RELEASENOTES.md for release 1.7.0 --- RELEASENOTES.md | 10 ++ package.json | 2 +- plugin.xml | 419 ++++++++++++++++++++--------------------------- tests/plugin.xml | 39 +---- 4 files changed, 195 insertions(+), 275 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 4d86be2..d0995e5 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,6 +20,16 @@ --> # Release Notes +### 1.6.2 (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 diff --git a/package.json b/package.json index bd3355a..a62b083 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-plugin-inappbrowser", - "version": "1.6.2-dev", + "version": "1.7.0", "description": "Cordova InAppBrowser Plugin", "types": "./types/index.d.ts", "cordova": { diff --git a/plugin.xml b/plugin.xml index 3dac978..4e959b3 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,243 +1,178 @@ - - - - - - InAppBrowser - Cordova InAppBrowser Plugin - Apache 2.0 - cordova,in,app,browser,inappbrowser - https://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser.git - https://issues.apache.org/jira/browse/CB/component/12320641 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + InAppBrowser + Cordova InAppBrowser Plugin + Apache 2.0 + cordova,in,app,browser,inappbrowser + https://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser.git + https://issues.apache.org/jira/browse/CB/component/12320641 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/plugin.xml b/tests/plugin.xml index 5c1debc..518abab 100644 --- a/tests/plugin.xml +++ b/tests/plugin.xml @@ -1,33 +1,8 @@ - - - - - Cordova InAppBrowser Plugin Tests - Apache 2.0 - - - - - - - + + + Cordova InAppBrowser Plugin Tests + Apache 2.0 + + + From 0ddc31d3f40d3c0690e3cb7902edfb5727f03f19 Mon Sep 17 00:00:00 2001 From: Steve Gill Date: Tue, 28 Feb 2017 17:56:00 -0800 Subject: [PATCH 2/8] Set VERSION to 1.7.1-dev (via coho) --- package.json | 2 +- plugin.xml | 419 +++++++++++++++++++++++++++-------------------- tests/plugin.xml | 39 ++++- 3 files changed, 275 insertions(+), 185 deletions(-) diff --git a/package.json b/package.json index a62b083..493b17c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-plugin-inappbrowser", - "version": "1.7.0", + "version": "1.7.1-dev", "description": "Cordova InAppBrowser Plugin", "types": "./types/index.d.ts", "cordova": { diff --git a/plugin.xml b/plugin.xml index 4e959b3..ea34ec5 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,178 +1,243 @@ - - - InAppBrowser - Cordova InAppBrowser Plugin - Apache 2.0 - cordova,in,app,browser,inappbrowser - https://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser.git - https://issues.apache.org/jira/browse/CB/component/12320641 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + InAppBrowser + Cordova InAppBrowser Plugin + Apache 2.0 + cordova,in,app,browser,inappbrowser + https://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser.git + https://issues.apache.org/jira/browse/CB/component/12320641 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/plugin.xml b/tests/plugin.xml index 518abab..e4e0941 100644 --- a/tests/plugin.xml +++ b/tests/plugin.xml @@ -1,8 +1,33 @@ - - - Cordova InAppBrowser Plugin Tests - Apache 2.0 - - - + + + + + Cordova InAppBrowser Plugin Tests + Apache 2.0 + + + + + + + From 0f5de8524f8f83c52e10d32da1d45f102086b5dd Mon Sep 17 00:00:00 2001 From: Steve Gill Date: Thu, 2 Mar 2017 16:42:02 -0800 Subject: [PATCH 3/8] CB-12519 updated incorrect version in RELEASENOTES.md --- RELEASENOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index d0995e5..9f3ddb0 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,7 +20,7 @@ --> # Release Notes -### 1.6.2 (Feb 28, 2017) +### 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` From c9ff78abfda78d89df887369da22ba2cd5f29159 Mon Sep 17 00:00:00 2001 From: daserge Date: Tue, 28 Feb 2017 17:31:22 +0300 Subject: [PATCH 4/8] CB-11248 InAppBrowser no focus on input text fields --- src/android/InAppBrowser.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java index c10617e..fefbcec 100644 --- a/src/android/InAppBrowser.java +++ b/src/android/InAppBrowser.java @@ -1046,6 +1046,10 @@ public class InAppBrowser extends CordovaPlugin { 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); From b923e88b232fcde9293cbb9355f00c89cc93caff Mon Sep 17 00:00:00 2001 From: Steve Gill Date: Fri, 21 Apr 2017 19:21:11 -0700 Subject: [PATCH 5/8] CB-12685: added package.json to tests folder --- tests/package.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 tests/package.json diff --git a/tests/package.json b/tests/package.json new file mode 100644 index 0000000..7c05778 --- /dev/null +++ b/tests/package.json @@ -0,0 +1,14 @@ +{ + "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" +} From bfb33988be6dae6708a254872da3bf4081eeeb7b Mon Sep 17 00:00:00 2001 From: filmaj Date: Tue, 25 Apr 2017 16:19:48 -0700 Subject: [PATCH 6/8] CB-12266: (browser platform) loadstop event.url is now a string instead of an object, aligning it with the other platforms. --- src/browser/InAppBrowserProxy.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/browser/InAppBrowserProxy.js b/src/browser/InAppBrowserProxy.js index da7dacd..cc1de19 100644 --- a/src/browser/InAppBrowserProxy.js +++ b/src/browser/InAppBrowserProxy.js @@ -31,15 +31,15 @@ var browserWrap, function attachNavigationEvents(element, callback) { var onError = function () { - callback({ type: "loaderror", url: this.contentWindow.location}, {keepCallback: true}); + callback({ type: "loaderror", url: this.contentWindow.location.href}, {keepCallback: true}); }; element.addEventListener("pageshow", function () { - callback({ type: "loadstart", url: this.contentWindow.location}, {keepCallback: true}); + callback({ type: "loadstart", url: this.contentWindow.location.href}, {keepCallback: true}); }); element.addEventListener("load", function () { - callback({ type: "loadstop", url: this.contentWindow.location}, {keepCallback: true}); + callback({ type: "loadstop", url: this.contentWindow.location.href}, {keepCallback: true}); }); element.addEventListener("error", onError); From 531a508c0d20606e19f5a62124e080458757b986 Mon Sep 17 00:00:00 2001 From: Alexander Sorokin Date: Wed, 26 Apr 2017 16:07:45 +0300 Subject: [PATCH 7/8] CB-12622: Added Android 6.0 build badges to README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4e05309..fce2ddb 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,9 @@ description: Open an in-app browser window. # under the License. --> -|Android 4.4|Android 5.1|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=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)| +|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 From ff6a765facd65fb9fced817d88eb6f193436dcda Mon Sep 17 00:00:00 2001 From: filmaj Date: Thu, 27 Apr 2017 12:51:08 -0700 Subject: [PATCH 8/8] CB-12736 Updated version and RELEASENOTES.md for release 1.7.1 (via coho) --- RELEASENOTES.md | 6 ++++++ package.json | 2 +- plugin.xml | 2 +- tests/plugin.xml | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 9f3ddb0..ddd30d5 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -20,6 +20,12 @@ --> # 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 diff --git a/package.json b/package.json index 493b17c..2dee291 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-plugin-inappbrowser", - "version": "1.7.1-dev", + "version": "1.7.1", "description": "Cordova InAppBrowser Plugin", "types": "./types/index.d.ts", "cordova": { diff --git a/plugin.xml b/plugin.xml index ea34ec5..4f900d3 100644 --- a/plugin.xml +++ b/plugin.xml @@ -20,7 +20,7 @@ + version="1.7.1"> InAppBrowser Cordova InAppBrowser Plugin diff --git a/tests/plugin.xml b/tests/plugin.xml index e4e0941..b7de65f 100644 --- a/tests/plugin.xml +++ b/tests/plugin.xml @@ -20,7 +20,7 @@ + version="1.7.1"> Cordova InAppBrowser Plugin Tests Apache 2.0