3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-16 19:28:14 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX: WebView: not wrap javascript

Browse source 
Change-Id: If2b1fe8163599ebbfd97334115a786a8985bf876
This commit is contained in:
chunmao.guo 2023-07-20 09:52:22 +08:00 • committed by SoftFever
parent 1fa6ee78e7
commit 6a767a5f67
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/slic3r/GUI/Widgets/WebView.cpp
View file

@ -249,14 +249,10 @@ bool WebView::RunScript(wxWebView *webView, wxString const &javascript)
ICoreWebView2 * webView2 = (ICoreWebView2 *) webView->GetNativeBackend(); ICoreWebView2 * webView2 = (ICoreWebView2 *) webView->GetNativeBackend();
if (webView2 == nullptr) if (webView2 == nullptr)
return false; return false;
int count = 0; return webView2->ExecuteScript(javascript, NULL) == 0;
wxJSScriptWrapper wrapJS(javascript, &count);
return webView2->ExecuteScript(wrapJS.GetWrappedCode(), NULL) == 0;
#elif defined __WXMAC__ #elif defined __WXMAC__
WKWebView * wkWebView = (WKWebView *) webView->GetNativeBackend(); WKWebView * wkWebView = (WKWebView *) webView->GetNativeBackend();
int count = 0; Slic3r::GUI::WKWebView_evaluateJavaScript(wkWebView, javascript, nullptr);
wxJSScriptWrapper wrapJS(javascript, &count);
Slic3r::GUI::WKWebView_evaluateJavaScript(wkWebView, wrapJS.GetWrappedCode(), nullptr);
return true; return true;
#else #else
WebKitWebView *wkWebView = (WebKitWebView *) webView->GetNativeBackend(); WebKitWebView *wkWebView = (WebKitWebView *) webView->GetNativeBackend();