fix: resolve deprecation warnings and upgrade dependencies
This commit is contained in:
1 parent
150d0108b7
commit
28f3705596
7 files changed
+651
-525
No files matched your search
Vendored
+3
-3
@@ -356,7 +356,7 @@ impl InnerWebView {
|
||||
if let Some(pending_scripts) = pending_scripts_.take() {
|
||||
let cancellable: Option<&Cancellable> = None;
|
||||
for script in pending_scripts {
|
||||
webview.run_javascript(&script, cancellable, |_| ());
|
||||
webview.evaluate_javascript(&script, None::<&str>, None::<&str>, cancellable, |_| ());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -699,13 +699,13 @@ impl InnerWebView {
|
||||
#[cfg(feature = "tracing")]
|
||||
let span = SendEnteredSpan(tracing::debug_span!("wry::eval").entered());
|
||||
|
||||
self.webview.run_javascript(js, cancellable, |result| {
|
||||
self.webview.evaluate_javascript(js, None::<&str>, None::<&str>, cancellable, |result| {
|
||||
#[cfg(feature = "tracing")]
|
||||
drop(span);
|
||||
|
||||
if let Some(callback) = callback {
|
||||
let result = result
|
||||
.map(|r| r.js_value().and_then(|js| js.to_json(0)))
|
||||
.map(|r| r.to_json(0))
|
||||
.unwrap_or_default()
|
||||
.unwrap_or_default()
|
||||
.to_string();
|
||||
|
||||
+20
-8
@@ -19,8 +19,11 @@ pub fn setup(webview: &WebView) {
|
||||
8 => {
|
||||
inhibit = true;
|
||||
bf_state_c.set(BACK);
|
||||
webview.run_javascript(
|
||||
&create_js_mouse_event(event, true, &bf_state_c),
|
||||
let js = create_js_mouse_event(event, true, &bf_state_c);
|
||||
webview.evaluate_javascript(
|
||||
&js,
|
||||
None::<&str>,
|
||||
None::<&str>,
|
||||
None::<>k::gio::Cancellable>,
|
||||
|_| {},
|
||||
);
|
||||
@@ -29,8 +32,11 @@ pub fn setup(webview: &WebView) {
|
||||
9 => {
|
||||
inhibit = true;
|
||||
bf_state_c.set(FORWARD);
|
||||
webview.run_javascript(
|
||||
&create_js_mouse_event(event, true, &bf_state_c),
|
||||
let js = create_js_mouse_event(event, true, &bf_state_c);
|
||||
webview.evaluate_javascript(
|
||||
&js,
|
||||
None::<&str>,
|
||||
None::<&str>,
|
||||
None::<>k::gio::Cancellable>,
|
||||
|_| {},
|
||||
);
|
||||
@@ -53,8 +59,11 @@ pub fn setup(webview: &WebView) {
|
||||
8 => {
|
||||
inhibit = true;
|
||||
bf_state_c.remove(BACK);
|
||||
webview.run_javascript(
|
||||
&create_js_mouse_event(event, false, &bf_state_c),
|
||||
let js = create_js_mouse_event(event, false, &bf_state_c);
|
||||
webview.evaluate_javascript(
|
||||
&js,
|
||||
None::<&str>,
|
||||
None::<&str>,
|
||||
None::<>k::gio::Cancellable>,
|
||||
|_| {},
|
||||
);
|
||||
@@ -63,8 +72,11 @@ pub fn setup(webview: &WebView) {
|
||||
9 => {
|
||||
inhibit = true;
|
||||
bf_state_c.remove(FORWARD);
|
||||
webview.run_javascript(
|
||||
&create_js_mouse_event(event, false, &bf_state_c),
|
||||
let js = create_js_mouse_event(event, false, &bf_state_c);
|
||||
webview.evaluate_javascript(
|
||||
&js,
|
||||
None::<&str>,
|
||||
None::<&str>,
|
||||
None::<>k::gio::Cancellable>,
|
||||
|_| {},
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user