From e4625d5c9a58e53b0731b9679736cc50a24d426c Mon Sep 17 00:00:00 2001 From: Lorenzo Pichilli Date: Wed, 11 Dec 2019 01:47:10 +0100 Subject: [PATCH] fix name dropDownWorkaroundEnabled --- .idea/workspace.xml | 50 +++++++++---------- CHANGELOG.md | 2 +- .../InAppWebView/InAppWebViewClient.java | 2 +- .../InAppWebView/InAppWebViewOptions.java | 2 +- lib/src/webview_options.dart | 8 +-- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5e10a816..87d1c1ad 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -16,7 +16,9 @@ - + + + @@ -39,11 +41,10 @@ - - + + - - + @@ -64,8 +65,8 @@ - - + + @@ -121,8 +122,8 @@ - - + + @@ -239,8 +240,8 @@ @@ -889,31 +890,30 @@ - - - - - - - - - - - - - + + + + + + + + + + + + - - + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c528282..ba14ad10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ - Updated default value for `domStorageEnabled` option to `true` for Android - Fix for Android `InAppBrowser` for some controller methods not exposed. - Merge "Fixes null error when calling getOptions for InAppBrowser class" [#214](https://github.com/pichillilorenzo/flutter_inappwebview/pull/214) (thanks to [panndoraBoo](https://github.com/panndoraBoo)) -- Added `dropDownWorkaroudEnabled` webview option for Android to enable a temporary workaround for html dropdowns (issue [#182](https://github.com/pichillilorenzo/flutter_inappwebview/issues/182)) +- Added `dropDownWorkaroundEnabled` webview option for Android to enable a temporary workaround for html dropdowns (issue [#182](https://github.com/pichillilorenzo/flutter_inappwebview/issues/182)) ### BREAKING CHANGES diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewClient.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewClient.java index 8f5fb573..84d4f583 100644 --- a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewClient.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewClient.java @@ -226,7 +226,7 @@ public class InAppWebViewClient extends WebViewClient { String js = InAppWebView.platformReadyJS.replaceAll("[\r\n]+", ""); - if (webView.options.dropDownWorkaroudEnabled) { + if (webView.options.dropDownWorkaroundEnabled) { js += InAppWebView.dropDownWorkaroundJS.replaceAll("[\r\n]+", ""); } diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewOptions.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewOptions.java index 92224154..8f3a6da0 100644 --- a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewOptions.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/InAppWebView/InAppWebViewOptions.java @@ -83,7 +83,7 @@ public class InAppWebViewOptions extends Options { public Boolean hardwareAcceleration = true; public Boolean supportMultipleWindows = false; public String regexToCancelSubFramesLoading; - public Boolean dropDownWorkaroudEnabled = false; + public Boolean dropDownWorkaroundEnabled = false; @Override public Object onParse(Map.Entry pair) { diff --git a/lib/src/webview_options.dart b/lib/src/webview_options.dart index 12a03308..1109221e 100644 --- a/lib/src/webview_options.dart +++ b/lib/src/webview_options.dart @@ -413,7 +413,7 @@ class AndroidInAppWebViewOptions ///The default value is `false`. /// ///**NOTE**: available on Android 19+. - bool dropDownWorkaroudEnabled; + bool dropDownWorkaroundEnabled; AndroidInAppWebViewOptions( {this.textZoom = 100, @@ -458,7 +458,7 @@ class AndroidInAppWebViewOptions this.initialScale = 0, this.supportMultipleWindows = false, this.regexToCancelSubFramesLoading, - this.dropDownWorkaroudEnabled = false}); + this.dropDownWorkaroundEnabled = false}); @override Map toMap() { @@ -505,7 +505,7 @@ class AndroidInAppWebViewOptions "hardwareAcceleration": hardwareAcceleration, "supportMultipleWindows": supportMultipleWindows, "regexToCancelSubFramesLoading": regexToCancelSubFramesLoading, - "dropDownWorkaroudEnabled": dropDownWorkaroudEnabled + "dropDownWorkaroundEnabled": dropDownWorkaroundEnabled }; } @@ -560,7 +560,7 @@ class AndroidInAppWebViewOptions options.hardwareAcceleration = map["hardwareAcceleration"]; options.supportMultipleWindows = map["supportMultipleWindows"]; options.regexToCancelSubFramesLoading = map["regexToCancelSubFramesLoading"]; - options.dropDownWorkaroudEnabled = map["dropDownWorkaroudEnabled"]; + options.dropDownWorkaroundEnabled = map["dropDownWorkaroundEnabled"]; return options; } }