[epiphany/webkit2: 10/17] Por run javascript to WebKit2
- From: Carlos Garcia Campos <carlosgc src gnome org>
 
- To: commits-list gnome org
 
- Cc: 
 
- Subject: [epiphany/webkit2: 10/17] Por run javascript to WebKit2
 
- Date: Thu, 21 Jun 2012 11:15:11 +0000 (UTC)
 
commit c73ac0e80370060d19331bd6f184915d8e73842e
Author: Carlos Garcia Campos <cgarcia igalia com>
Date:   Wed May 30 17:25:54 2012 +0200
    Por run javascript to WebKit2
 embed/ephy-web-view.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 81672af..90c2884 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2937,15 +2937,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);
 
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]