mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-16 00:34:19 +00:00
Merge branch 'develop' into feature/linux_webview_handleJavascriptEvaluationCallback_jassert_fix
This commit is contained in:
commit
3f604bb03e
69 changed files with 1029 additions and 245 deletions
|
|
@ -1332,10 +1332,9 @@ public:
|
|||
g.fillAll (Colours::white);
|
||||
}
|
||||
|
||||
void evaluateJavascript (const String& script, WebBrowserComponent::EvaluationCallback callback) override
|
||||
void evaluateJavascript (const String& script, EvaluationCallback callback) override
|
||||
{
|
||||
if (callback != nullptr)
|
||||
evaluationCallbacks.push_back (std::move (callback));
|
||||
evaluationCallbacks.push_back (std::move (callback));
|
||||
|
||||
CommandReceiver::sendCommand (outChannel,
|
||||
"evaluateJavascript",
|
||||
|
|
@ -1374,7 +1373,7 @@ public:
|
|||
});
|
||||
|
||||
auto& cb = evaluationCallbacks.front();
|
||||
cb (result);
|
||||
NullCheckedInvocation::invoke (cb, result);
|
||||
evaluationCallbacks.pop_front();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue