Mercurial > dwindows
changeset 2007:3a26e6f6691d
GTK3: Enable javascript and use webkit_web_view_execute_script() when using
webkit1, this has no callback to see results but hopefully it will work.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Wed, 06 Nov 2019 14:37:01 +0000 |
parents | 6f1adc77de02 |
children | 74facb490f5a |
files | gtk3/dw.c |
diffstat | 1 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/gtk3/dw.c Wed Nov 06 13:09:31 2019 +0000 +++ b/gtk3/dw.c Wed Nov 06 14:37:01 2019 +0000 @@ -11508,13 +11508,17 @@ */ int dw_html_javascript_run(HWND handle, char *script, void *scriptdata) { -#ifdef USE_WEBKIT2 +#ifdef USE_WEBKIT int _locked_by_me = FALSE; WebKitWebView *web_view; DW_MUTEX_LOCK; if((web_view = _dw_html_web_view(handle))) - webkit_web_view_run_javascript (web_view, script, NULL, _html_result_event, scriptdata); +#ifdef USE_WEBKIT2 + webkit_web_view_run_javascript(web_view, script, NULL, _html_result_event, scriptdata); +#else + webkit_web_view_execute_script(web_view, script); +#endif DW_MUTEX_UNLOCK; return DW_ERROR_NONE; #else @@ -11558,9 +11562,14 @@ #ifdef USE_WEBKIT int _locked_by_me = FALSE; WebKitWebView *web_view; + WebKitSettings *settings; DW_MUTEX_LOCK; web_view = (WebKitWebView *)webkit_web_view_new(); + settings = webkit_web_view_get_settings(web_view); + /* Make sure java script is enabled */ + webkit_settings_set_enable_javascript(settings, TRUE); + webkit_web_view_set_settings(web_view, settings); /* WebKit2 no longer requires a scrolled window... * So only create a scrolled window and pack it in older versions. */