Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5b3f013
Adds JavaScript console override on WKWebView
mvanbeusekom Jul 21, 2023
2a388de
Adds JavaScript console override on WKWebView
mvanbeusekom Jul 21, 2023
3aa11af
Fix setConsoleLogCallback unit-test
mvanbeusekom Jul 21, 2023
0b08773
Fix analyze warning
mvanbeusekom Jul 21, 2023
fe22549
Adds the JavaScript info loglevel
mvanbeusekom Jul 24, 2023
0c45243
Fix integration test and dependencies
mvanbeusekom Jul 24, 2023
94775bb
wrap onConsoleMessage
bparrishMines Jul 25, 2023
d6b0600
Adds console log callback to Android and App facing packages
mvanbeusekom Jul 27, 2023
2eee568
Fixed formatting
mvanbeusekom Jul 27, 2023
e21cd64
Adds missing license block
mvanbeusekom Jul 27, 2023
e9b0f3d
Update packages/webview_flutter/webview_flutter_wkwebview/lib/src/web…
mvanbeusekom Aug 3, 2023
42b1210
Update packages/webview_flutter/webview_flutter_wkwebview/lib/src/web…
mvanbeusekom Aug 3, 2023
2a4dc3f
Merge remote-tracking branch 'upstream/main' into feature/forward_jav…
mvanbeusekom Aug 3, 2023
dafed42
Apply PR feedback
mvanbeusekom Aug 3, 2023
9e7fed2
Merge branch 'feature/forward_javascript_console' of github.com:basef…
mvanbeusekom Aug 3, 2023
de2a099
Apply PR feedback
mvanbeusekom Aug 3, 2023
6759419
Merge branch 'main' into feature/forward_javascript_console
mvanbeusekom Aug 3, 2023
4482d9a
Map TIP to JavaScriptConsoleLevel.debug
mvanbeusekom Aug 3, 2023
0a4f984
Merge branch 'feature/forward_javascript_console' of github.com:basef…
mvanbeusekom Aug 3, 2023
9b02117
Fix formatting and analyze warning
mvanbeusekom Aug 4, 2023
94ec766
Merge branch 'main' into feature/forward_javascript_console
mvanbeusekom Aug 4, 2023
56b2a5e
Generate updates test mocks
mvanbeusekom Aug 4, 2023
07f68b2
Merge branch 'main' of https://github.com/flutter/packages into featu…
mvanbeusekom Aug 4, 2023
4910c2e
Merge branch 'feature/forward_javascript_console' of github.com:basef…
mvanbeusekom Aug 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adds the JavaScript info loglevel
  • Loading branch information
mvanbeusekom committed Aug 2, 2023
commit fe225496b1990be580c7cd16978bee5e4c3c61e7
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,8 @@ flutter:
- assets/sample_video.mp4
- assets/www/index.html
- assets/www/styles/style.css

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{webview_flutter_platform_interface: {path: ../../../webview_flutter/webview_flutter_platform_interface}, webview_flutter_wkwebview: {path: ../../../webview_flutter/webview_flutter_wkwebview}}
5 changes: 5 additions & 0 deletions packages/webview_flutter/webview_flutter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,8 @@ dev_dependencies:
sdk: flutter
mockito: 5.4.1
plugin_platform_interface: ^2.1.3

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{webview_flutter_platform_interface: {path: ../../webview_flutter/webview_flutter_platform_interface}, webview_flutter_wkwebview: {path: ../../webview_flutter/webview_flutter_wkwebview}}
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,8 @@ flutter:
- assets/sample_video.mp4
- assets/www/index.html
- assets/www/styles/style.css

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{webview_flutter_platform_interface: {path: ../../../webview_flutter/webview_flutter_platform_interface}}
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,8 @@ dev_dependencies:
sdk: flutter
mockito: 5.4.1
pigeon: ^9.2.4

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{webview_flutter_platform_interface: {path: ../../webview_flutter/webview_flutter_platform_interface}}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ enum JavaScriptLogLevel {
/// Indicates a debug message was logged using the `console.debug` method.
debug,

/// Indicates an informational message was logged using the `console.info`
/// method.
info,

/// Indicates a log message was logged using the `console.log` method.
log,
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,8 @@ dev_dependencies:

flutter:
uses-material-design: true

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{webview_flutter_platform_interface: {path: ../../../webview_flutter/webview_flutter_platform_interface}}
5 changes: 5 additions & 0 deletions packages/webview_flutter/webview_flutter_web/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,8 @@ dev_dependencies:
flutter_test:
sdk: flutter
mockito: 5.4.1

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{webview_flutter_platform_interface: {path: ../../webview_flutter/webview_flutter_platform_interface}}
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,8 @@ flutter:
- assets/sample_video.mp4
- assets/www/index.html
- assets/www/styles/style.css

# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
dependency_overrides:
{webview_flutter_platform_interface: {path: ../../../webview_flutter/webview_flutter_platform_interface}, webview_flutter_wkwebview: {path: ../../../webview_flutter/webview_flutter_wkwebview}}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -540,10 +540,14 @@ class WebKitWebViewController extends PlatformWebViewController {
_onConsoleLogCallback!(
JavaScriptLogLevel.warning, consoleLog['message']! as String);
break;
case 'default':
case 'debug':
_onConsoleLogCallback!(
JavaScriptLogLevel.debug, consoleLog['message']! as String);
break;
case 'info':
_onConsoleLogCallback!(
JavaScriptLogLevel.info, consoleLog['message']! as String);
break;
case 'log':
default:
_onConsoleLogCallback!(
Expand Down Expand Up @@ -574,11 +578,13 @@ function log(type, args) {
}

let originalLog = console.log;
let originalInfo = console.info;
let originalWarn = console.warn;
let originalError = console.error;
let originalDebug = console.debug;

console.log = function() { log("log", arguments); originalLog.apply(null, arguments) };
console.info = function() { log("info", arguments); originalInfo.apple(null, arguments) };
console.warn = function() { log("warning", arguments); originalWarn.apply(null, arguments) };
console.error = function() { log("error", arguments); originalError.apply(null, arguments) };
console.debug = function() { log("debug", arguments); originalDebug.apply(null, arguments) };
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -1221,11 +1221,13 @@ function log(type, args) {
}

let originalLog = console.log;
let originalInfo = console.info;
let originalWarn = console.warn;
let originalError = console.error;
let originalDebug = console.debug;

console.log = function() { log("log", arguments); originalLog.apply(null, arguments) };
console.info = function() { log("info", arguments); originalInfo.apple(null, arguments) };
console.warn = function() { log("warning", arguments); originalWarn.apply(null, arguments) };
console.error = function() { log("error", arguments); originalError.apply(null, arguments) };
console.debug = function() { log("debug", arguments); originalDebug.apply(null, arguments) };
Expand Down