From 3ee0a2e7c1e1304d47b5d031497f2877214e2fd7 Mon Sep 17 00:00:00 2001 From: Daniel Carl Date: Mon, 27 Apr 2015 23:02:08 +0200 Subject: [PATCH] Fixed regression of ignored strict focus in frames (#201). --- src/dom.c | 2 -- src/main.c | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/dom.c b/src/dom.c index 75457d5..f2c5cb5 100644 --- a/src/dom.c +++ b/src/dom.c @@ -254,7 +254,6 @@ static gboolean auto_insert(Element *element) static gboolean editable_blur_cb(Element *element, Event *event) { - g_message("blur"); if (vb.mode->id == 'i') { vb_enter('n'); } @@ -263,7 +262,6 @@ static gboolean editable_blur_cb(Element *element, Event *event) static gboolean editable_focus_cb(Element *element, Event *event) { - g_message("focus"); auto_insert((Element*)webkit_dom_event_get_target(event)); return false; diff --git a/src/main.c b/src/main.c index ba14735..4f026d9 100644 --- a/src/main.c +++ b/src/main.c @@ -87,8 +87,8 @@ static gboolean navigation_decision_requested_cb(WebKitWebView *view, WebKitWebFrame *frame, WebKitNetworkRequest *request, WebKitWebNavigationAction *action, WebKitWebPolicyDecision *policy, gpointer data); -static void window_object_cleared_cb(GtkWidget *widget, WebKitWebFrame *frame, - JSContextRef js, JSObjectRef win, gpointer user_data); +static void onload_event_cb(WebKitWebView *view, WebKitWebFrame *frame, + gpointer user_data); static void hover_link_cb(WebKitWebView *webview, const char *title, const char *link); static void title_changed_cb(WebKitWebView *webview, WebKitWebFrame *frame, const char *title); static gboolean mimetype_decision_cb(WebKitWebView *webview, @@ -1132,7 +1132,7 @@ static void setup_signals() "signal::should-show-delete-interface-for-element", G_CALLBACK(gtk_false), NULL, "signal::resource-request-starting", G_CALLBACK(webview_request_starting_cb), NULL, "signal::navigation-policy-decision-requested", G_CALLBACK(navigation_decision_requested_cb), NULL, - "signal::window-object-cleared", G_CALLBACK(window_object_cleared_cb), NULL, + "signal::onload-event", G_CALLBACK(onload_event_cb), NULL, NULL ); @@ -1410,8 +1410,8 @@ static gboolean navigation_decision_requested_cb(WebKitWebView *view, return false; } -static void window_object_cleared_cb(GtkWidget *widget, WebKitWebFrame *frame, - JSContextRef js, JSObjectRef win, gpointer user_data) +static void onload_event_cb(WebKitWebView *view, WebKitWebFrame *frame, + gpointer user_data) { Document *doc = webkit_web_frame_get_dom_document(frame); dom_check_auto_insert(doc); -- 2.20.1