Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement RunScriptAsync for macOS

Browse Source
This commit is contained in:
Tobias Taschner
2021-04-08 09:51:46 +02:00
committed by Tobias Taschner
parent e9dc74cb6d
commit 7aa1d84e4a
2 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/webview_webkit.h
View File

@@ -94,7 +94,7 @@ public:
virtual void SetEditable(bool enable = true) wxOVERRIDE; virtual void SetEditable(bool enable = true) wxOVERRIDE;
virtual bool IsEditable() const wxOVERRIDE; virtual bool IsEditable() const wxOVERRIDE;
bool RunScript(const wxString& javascript, wxString* output = NULL) const wxOVERRIDE; virtual void RunScriptAsync(const wxString& javascript, void* clientData = NULL) const wxOVERRIDE;
virtual bool AddScriptMessageHandler(const wxString& name) wxOVERRIDE; virtual bool AddScriptMessageHandler(const wxString& name) wxOVERRIDE;
virtual bool RemoveScriptMessageHandler(const wxString& name) wxOVERRIDE; virtual bool RemoveScriptMessageHandler(const wxString& name) wxOVERRIDE;
virtual bool AddUserScript(const wxString& javascript, virtual bool AddUserScript(const wxString& javascript,

29
src/osx/webview_webkit.mm
View File

@@ -371,41 +371,28 @@ bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType type) const
} }
} }
bool wxWebViewWebKit::RunScript(const wxString& javascript, wxString* output) const void wxWebViewWebKit::RunScriptAsync(const wxString& javascript, void* clientData) const
{ {
wxJSScriptWrapper wrapJS(javascript, wxJSScriptWrapper::JS_OUTPUT_STRING); wxJSScriptWrapper wrapJS(javascript, wxJSScriptWrapper::JS_OUTPUT_STRING);
__block int scriptResult = -1;
__block wxString result;
// Start script execution // Start script execution
[m_webView evaluateJavaScript:wxCFStringRef(wrapJS.GetWrappedCode()).AsNSString() [m_webView evaluateJavaScript:wxCFStringRef(wrapJS.GetWrappedCode()).AsNSString()
completionHandler:^(id _Nullable obj, NSError * _Nullable error) { completionHandler:^(id _Nullable obj, NSError * _Nullable error) {
if (error) if (error)
{ {
result.assign(wxCFStringRef(error.localizedDescription).AsString()); SendScriptResult(clientData, false, wxCFStringRef(error.localizedDescription).AsString());
scriptResult = 0;
} }
else else
{ {
wxString scriptResult;
if (obj) if (obj)
result.assign(wxCFStringRef::AsString([NSString stringWithFormat:@"%@", obj])); scriptResult = wxCFStringRef::AsString([NSString stringWithFormat:@"%@", obj]);
scriptResult = 1; wxString scriptOutput;
bool success = wxJSScriptWrapper::ExtractOutput(scriptResult, &scriptOutput);
SendScriptResult(clientData, success, scriptOutput);
} }
}]; }];
// Wait for script exection
while (scriptResult == -1)
wxYield();
if (scriptResult == 0)
{
if (output)
output->assign(result);
return false;
}
else
return wxJSScriptWrapper::ExtractOutput(result, output);
} }
bool wxWebViewWebKit::AddScriptMessageHandler(const wxString& name) bool wxWebViewWebKit::AddScriptMessageHandler(const wxString& name)