aboutsummaryrefslogtreecommitdiffstats
path: root/embed/ephy-web-view.c
diff options
context:
space:
mode:
authorCarlos Garcia Campos <cgarcia@igalia.com>2012-05-30 23:25:54 +0800
committerCarlos Garcia Campos <carlosgc@gnome.org>2012-06-25 19:21:53 +0800
commitb7f905eb4738760f4c1cde4ae2d4154cf7af57ba (patch)
tree1ccc0ea7a27ff860976a1d2f9c15978f7c1e177a /embed/ephy-web-view.c
parent94e9d47168cce812b5265507d97da157a5dcf77b (diff)
downloadgsoc2013-epiphany-b7f905eb4738760f4c1cde4ae2d4154cf7af57ba.tar
gsoc2013-epiphany-b7f905eb4738760f4c1cde4ae2d4154cf7af57ba.tar.gz
gsoc2013-epiphany-b7f905eb4738760f4c1cde4ae2d4154cf7af57ba.tar.bz2
gsoc2013-epiphany-b7f905eb4738760f4c1cde4ae2d4154cf7af57ba.tar.lz
gsoc2013-epiphany-b7f905eb4738760f4c1cde4ae2d4154cf7af57ba.tar.xz
gsoc2013-epiphany-b7f905eb4738760f4c1cde4ae2d4154cf7af57ba.tar.zst
gsoc2013-epiphany-b7f905eb4738760f4c1cde4ae2d4154cf7af57ba.zip
Por run javascript to WebKit2
https://bugzilla.gnome.org/show_bug.cgi?id=678601
Diffstat (limited to 'embed/ephy-web-view.c')
-rw-r--r--embed/ephy-web-view.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index cc9469aa2..2f5ae2b7d 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2953,15 +2953,15 @@ ephy_web_view_load_url (EphyWebView *view,
g_free (temp_url);
#endif
} else if (g_str_has_prefix (effective_url, "javascript:")) {
-#ifdef HAVE_WEBKIT2
- /* TODO: Run JavaScript */
-#else
char *decoded_url;
decoded_url = soup_uri_decode (effective_url);
+#ifdef HAVE_WEBKIT2
+ webkit_web_view_run_javascript (WEBKIT_WEB_VIEW (view), decoded_url, NULL, NULL, NULL);
+#else
webkit_web_view_execute_script (WEBKIT_WEB_VIEW (view), decoded_url);
- g_free (decoded_url);
#endif
+ g_free (decoded_url);
} else
webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view), effective_url);