Merge remote-tracking branch 'upstream/master'

.appveyor.yml

@@ -16,7 +16,6 @@ environment:
  matrix:
  - PLATFORM: windows-10-store
  JUST_BUILD: --justBuild
- - PLATFORM: local\browser
 install:
  - npm cache clean -f
  - node --version

.gitignore

@@ -14,11 +14,3 @@ Thumbs.db
 
 node_modules
 .idea
-
-
-
-
-
-
-
-

.travis.yml

@@ -43,6 +43,7 @@ matrix:
  - tools
  - platform-tools
  - tools
+ - build-tools-26.0.2
  - env: PLATFORM=android-5.1
  os: linux
  language: android
@@ -52,6 +53,7 @@ matrix:
  - tools
  - platform-tools
  - tools
+ - build-tools-26.0.2
  - env: PLATFORM=android-6.0
  os: linux
  language: android
@@ -61,6 +63,7 @@ matrix:
  - tools
  - platform-tools
  - tools
+ - build-tools-26.0.2
  - env: PLATFORM=android-7.0
  os: linux
  language: android
@@ -70,14 +73,15 @@ matrix:
  - tools
  - platform-tools
  - tools
+ - build-tools-26.0.2
 before_install:
 - rm -rf ~/.nvm && git clone https:/creationix/nvm.git ~/.nvm && (cd ~/.nvm
  && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm
  install $TRAVIS_NODE_VERSION
 - node --version
 - if [[ "$PLATFORM" =~ android ]]; then gradle --version; fi
 - if [[ "$PLATFORM" =~ ios ]]; then npm install -g ios-deploy; fi
-- if [[ "$PLATFORM" =~ android ]]; then echo y | android update sdk -u --filter android-22,android-23,android-24,android-25;
+- if [[ "$PLATFORM" =~ android ]]; then echo y | android update sdk -u --filter android-22,android-23,android-24,android-25,android-26;
  fi
 - git clone https:/apache/cordova-paramedic /tmp/paramedic && pushd /tmp/paramedic
  && npm install && popd

README.md

@@ -112,9 +112,13 @@ 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.
  - __clearcache__: set to `yes` to have the browser's cookie cache cleared before the new window is opened
  - __clearsessioncache__: set to `yes` to have the session cookie cache cleared before the new window is opened
- - __closebuttoncaption__: set to a string to use as the close buttons caption instead of a X. Note that you need to localize this value yourself.
+ - __closebuttoncaption__: set to a string to use as the close button's caption instead of a X. Note that you need to localize this value yourself.
  - __closebuttoncolor__: set to a valid hex color string, for example: `#00ff00`, and it will change the
  close button color from default, regardless of being a text or default X. Only has effect if user has location set to `yes`.
+ - __footer__: set to `yes` to show a close button in the footer similar to the iOS __Done__ button.
+ The close button will appear the same as for the header hence use __closebuttoncaption__ and __closebuttoncolor__ to set its properties.
+ - __footercolor__: set to a valid hex color string, for example `#00ff00` or `#CC00ff00` (`#aarrggbb`) , and it will change the footer color from default.
+ Only has effect if user has __footer__ set to `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.
  - __hidenavigationbuttons__: set to `yes` to hide the navigation buttons on the location toolbar, only has effect if user has location set to `yes`. The default value is `no`.
  - __hideurlbar__: set to `yes` to hide the url bar on the location toolbar, only has effect if user has location set to `yes`. The default value is `no`.
@@ -155,66 +159,23 @@ instance, or the system browser.
 
 ### Supported Platforms
 
-- Amazon Fire OS
 - Android
-- BlackBerry 10
 - Browser
-- Firefox OS
 - iOS
 - OSX
-- Windows 8 and 8.1
-- Windows Phone 7 and 8
+- Windows
 
 ### Example
 
  var ref = cordova.InAppBrowser.open('http://apache.org', '_blank', 'location=yes');
  var ref2 = cordova.InAppBrowser.open(encodeURI('http://ja.m.wikipedia.org/wiki/ハングル'), '_blank', 'location=yes');
 
-### Firefox OS Quirks
-
-As plugin doesn't enforce any design there is a need to add some CSS rules if
-opened with `target='_blank'`. The rules might look like these
-
-``` css
-.inAppBrowserWrap {
- background-color: rgba(0,0,0,0.75);
- color: rgba(235,235,235,1.0);
-}
-.inAppBrowserWrap menu {
- overflow: auto;
- list-style-type: none;
- padding-left: 0;
-}
-.inAppBrowserWrap menu li {
- font-size: 25px;
- height: 25px;
- float: left;
- margin: 0 10px;
- padding: 3px 10px;
- text-decoration: none;
- color: #ccc;
- display: block;
- background: rgba(30,30,30,0.50);
-}
-.inAppBrowserWrap menu li.disabled {
- color: #777;
-}
-```
-
 ### 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.
-
-Similar to Firefox OS IAB window visual behaviour can be overridden via `inAppBrowserWrap`/`inAppBrowserWrapFullscreen` CSS classes
-
 ### Browser Quirks
 
 - Plugin is implemented via iframe,
@@ -335,12 +296,11 @@ function executeScriptCallBack(params) {
 
 ### Supported Platforms
 
-- Amazon Fire OS
 - Android
 - Browser
 - iOS
-- Windows 8 and 8.1
-- Windows Phone 7 and 8
+- Windows
+- OSX
 
 ### Browser Quirks
 
@@ -371,12 +331,10 @@ The function is passed an `InAppBrowserEvent` object.
 
 ### Supported Platforms
 
-- Amazon Fire OS
 - Android
 - Browser
 - iOS
-- Windows 8 and 8.1
-- Windows Phone 7 and 8
+- Windows
 
 ### Quick Example
 
@@ -395,13 +353,10 @@ The function is passed an `InAppBrowserEvent` object.
 
 ### Supported Platforms
 
-- Amazon Fire OS
 - Android
 - Browser
-- Firefox OS
 - iOS
-- Windows 8 and 8.1
-- Windows Phone 7 and 8
+- Windows
 
 ### Quick Example
 
@@ -418,11 +373,10 @@ The function is passed an `InAppBrowserEvent` object.
 
 ### Supported Platforms
 
-- Amazon Fire OS
 - Android
 - Browser
 - iOS
-- Windows 8 and 8.1
+- Windows
 
 ### Quick Example
 
@@ -440,10 +394,9 @@ The function is passed an `InAppBrowserEvent` object.
 
 ### Supported Platforms
 
-- Amazon Fire OS
 - Android
 - iOS
-- Windows 8 and 8.1
+- Windows
 
 ### Quick Example
 
@@ -472,11 +425,10 @@ The function is passed an `InAppBrowserEvent` object.
 
 ### Supported Platforms
 
-- Amazon Fire OS
 - Android
 - Browser
 - iOS
-- Windows 8 and 8.1
+- Windows
 
 ### Quick Example
 
@@ -509,7 +461,6 @@ Due to [MSDN docs](https://msdn.microsoft.com/en-us/library/windows.ui.xaml.cont
 
 ### Supported Platforms
 
-- Amazon Fire OS
 - Android
 - iOS
 - Windows

RELEASENOTES.md

@@ -20,6 +20,33 @@
 -->
 # Release Notes
 
+### 2.0.2 (Jan 24, 2018)
+* [CB-13791](https://issues.apache.org/jira/browse/CB-13791) Add **Android** support for a footer close button
+* [CB-13409](https://issues.apache.org/jira/browse/CB-13409) restore gitignore to default
+* [CB-13409](https://issues.apache.org/jira/browse/CB-13409) restore gitignore to default
+* [CB-13409](https://issues.apache.org/jira/browse/CB-13409) restore gitignore to default
+* [CB-13409](https://issues.apache.org/jira/browse/CB-13409) restore gitignore to default
+* [CB-13409](https://issues.apache.org/jira/browse/CB-13409) ignore idea folder
+* [CB-13409](https://issues.apache.org/jira/browse/CB-13409) change hidetoolbarnavigationbuttons to hidenavigationbuttons in iso
+* [CB-13409](https://issues.apache.org/jira/browse/CB-13409) **Android** works well now, all changes are now documented
+* [CB-13409](https://issues.apache.org/jira/browse/CB-13409) Lets user adjust color of toolbar, hide navigation buttons and set custom text on close button
+* [CB-13746](https://issues.apache.org/jira/browse/CB-13746) Add build-tools-26.0.2 to travis
+
+### 2.0.1 (Dec 27, 2017)
+* [CB-13699](https://issues.apache.org/jira/browse/CB-13699) Fix to allow 2.0.0 version install
+
+### 2.0.0 (Dec 15, 2017)
+* [CB-13662](https://issues.apache.org/jira/browse/CB-13662) remove deprecated platforms
+
+### 1.7.2 (Nov 06, 2017)
+* [CB-13473](https://issues.apache.org/jira/browse/CB-13473) (CI) Removed **Browser** builds from AppVeyor
+* [CB-13472](https://issues.apache.org/jira/browse/CB-13472) (CI) Fixed Travis **Android** builds again
+* [CB-13347](https://issues.apache.org/jira/browse/CB-13347) Enable thirdparty cookies on `>=Android 5.0` device
+* [CB-12895](https://issues.apache.org/jira/browse/CB-12895) added `eslint` and removed `jshint`
+* [CB-12975](https://issues.apache.org/jira/browse/CB-12975) (docs) Resort and reword `cordova.InAppBrowser.open` `options` lists
+* [CB-12586](https://issues.apache.org/jira/browse/CB-12586) (iOS) fix method `hide` doesn't work
+* [CB-12847](https://issues.apache.org/jira/browse/CB-12847) added `bugs` entry to `package.json`.
+
 ### 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.

package.json

@@ -1,21 +1,16 @@
 {
  "name": "cordova-plugin-inappbrowser",
- "version": "1.7.2-dev",
+ "version": "2.0.3-dev",
  "description": "Cordova InAppBrowser Plugin",
  "types": "./types/index.d.ts",
  "cordova": {
  "id": "cordova-plugin-inappbrowser",
  "platforms": [
  "android",
- "amazon-fireos",
- "ubuntu",
+ "browser",
  "ios",
  "osx",
- "wp7",
- "wp8",
- "windows8",
- "windows",
- "firefoxos"
+ "windows"
  ]
  },
  "repository": {
@@ -33,15 +28,10 @@
  "inappbrowser",
  "ecosystem:cordova",
  "cordova-android",
- "cordova-amazon-fireos",
- "cordova-ubuntu",
+ "cordova-browser",
  "cordova-ios",
  "cordova-osx",
- "cordova-wp7",
- "cordova-wp8",
- "cordova-windows8",
- "cordova-windows",
- "cordova-firefoxos"
+ "cordova-windows"
  ],
  "scripts": {
  "test": "npm run eslint",
@@ -52,7 +42,7 @@
  "0.2.3": {
  "cordova": ">=3.1.0"
  },
- "2.0.0": {
+ "3.0.0": {
  "cordova": ">100"
  }
  }