zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-510, #278, #417: Fixed crash when attempting to execute JavaScript.

Browse source
This commit is contained in:
Damian Büchel 2022-07-25 18:37:43 +02:00
parent 82e8166fd5
commit 9d7b89d36c
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
SafeExamBrowser.Browser/BrowserControl.cs
View file

@ -7,6 +7,7 @@
*/ */
using System; using System;
using System.Threading.Tasks;
using CefSharp; using CefSharp;
using SafeExamBrowser.Browser.Wrapper; using SafeExamBrowser.Browser.Wrapper;
using SafeExamBrowser.Browser.Wrapper.Events; using SafeExamBrowser.Browser.Wrapper.Events;
@ -63,10 +64,12 @@ namespace SafeExamBrowser.Browser
} }
public void ExecuteJavascript(string javascript, Action<JavascriptResult> callback) public void ExecuteJavascript(string javascript, Action<JavascriptResult> callback)
{
if ((control as IWebBrowser)?.CanExecuteJavascriptInMainFrame == true)
{ {
control.EvaluateScriptAsync(javascript).ContinueWith(t => control.EvaluateScriptAsync(javascript).ContinueWith(t =>
{ {
callback(new JavascriptResult() callback(new JavascriptResult
{ {
Message = t.Result.Message, Message = t.Result.Message,
Result = t.Result.Result, Result = t.Result.Result,
@ -74,6 +77,15 @@ namespace SafeExamBrowser.Browser
}); });
}); });
} }
else
{
Task.Run(() => callback(new JavascriptResult
{
Message = "JavaScript can't be executed in the main frame!",
Success = false
}));
}
}
public void Find(string term, bool isInitial, bool caseSensitive, bool forward = true) public void Find(string term, bool isInitial, bool caseSensitive, bool forward = true)
{ {