Skip to content

Commit

Permalink
Merge pull request j5int#9 from stevehof/master
Browse files Browse the repository at this point in the history
Hide inAppBrowser dialog instead of closing
  • Loading branch information
rorygrandin authored Jul 9, 2019
2 parents 2c240f1 + ca54ee8 commit 2696279
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-inappbrowser",
"version": "3.0.0-j5.2",
"version": "3.0.0-j5.3",
"description": "Cordova InAppBrowser Plugin",
"types": "./types/index.d.ts",
"cordova": {
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="cordova-plugin-inappbrowser"
version="3.0.0-j5.2">
version="3.0.0-j5.3">

<name>InAppBrowser</name>
<description>Cordova InAppBrowser Plugin</description>
Expand Down
2 changes: 1 addition & 1 deletion src/android/InAppBrowser.java
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ public void run() {
dialog.getWindow().getAttributes().windowAnimations = android.R.style.Animation_Dialog;
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setCancelable(true);
dialog.setInAppBroswer(getInAppBrowser());
dialog.setInAppBrowser(getInAppBrowser());

// Main container layout
LinearLayout main = new LinearLayout(cordova.getActivity());
Expand Down
6 changes: 3 additions & 3 deletions src/android/InAppBrowserDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public InAppBrowserDialog(Context context, int theme) {
this.context = context;
}

public void setInAppBroswer(InAppBrowser browser) {
public void setInAppBrowser(InAppBrowser browser) {
this.inAppBrowser = browser;
}

Expand All @@ -49,8 +49,8 @@ public void onBackPressed () {
// because it does a clean up
if (this.inAppBrowser.hardwareBack() && this.inAppBrowser.canGoBack()) {
this.inAppBrowser.goBack();
} else {
this.inAppBrowser.closeDialog();
}else{
this.hide();
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="cordova-plugin-inappbrowser-tests"
version="3.0.0-j5.2">
version="3.0.0-j5.3">
<name>Cordova InAppBrowser Plugin Tests</name>
<license>Apache 2.0</license>

Expand Down

0 comments on commit 2696279

Please sign in to comment.