mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

macOS: Don't call stop() in WebBrowserComponent::goToURL() when evaluating Javascript

Browse source
This commit is contained in:
ed 2021-02-19 14:25:56 +00:00
parent 51cda82fb7
commit 0fc0dce1b8
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/juce_gui_extra/native/juce_mac_WebBrowserComponent.mm
View file

@ -312,17 +312,18 @@ public:
const StringArray* headers,
const MemoryBlock* postData)
{
stop();
if (url.trimStart().startsWithIgnoreCase ("javascript:"))
{
[webView evaluateJavaScript: juceStringToNS (url.fromFirstOccurrenceOf (":", false, false))
completionHandler: nil];
return;
}
else if (NSMutableURLRequest* request = getRequestForURL (url, headers, postData))
{
stop();
if (NSMutableURLRequest* request = getRequestForURL (url, headers, postData))
[webView loadRequest: request];
}
}
void goBack() { [webView goBack]; }
@ -531,14 +532,15 @@ public:
const StringArray* headers,
const MemoryBlock* postData)
{
stop();
if (url.trimStart().startsWithIgnoreCase ("javascript:"))
{
[webView stringByEvaluatingJavaScriptFromString:
juceStringToNS (url.fromFirstOccurrenceOf (":", false, false))];
[webView stringByEvaluatingJavaScriptFromString: juceStringToNS (url.fromFirstOccurrenceOf (":", false, false))];
return;
}
else if (NSMutableURLRequest* request = getRequestForURL (url, headers, postData))
stop();
if (NSMutableURLRequest* request = getRequestForURL (url, headers, postData))
{
#if JUCE_MAC
[[webView mainFrame] loadRequest: request];