From 8789b7c330d4bf21a084f3451f089a80a169123c Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Tue, 2 May 2006 13:47:16 +0200 Subject: [PATCH] Ecmascript: activate link only when onClick returns true [ Merge stuff from commit c3f17eadebf4c166c6d2fee5cd142dc92748d530, namely the remaining part which changes enter() to only call activate_link when needed. --jonas ] --- src/viewer/text/link.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c index 75d382a5..190dc193 100644 --- a/src/viewer/text/link.c +++ b/src/viewer/text/link.c @@ -906,7 +906,6 @@ activate_link(struct session *ses, struct document_view *doc_view, return FRAME_EVENT_OK; break; - case LINK_CHECKBOX: link_fc = get_link_form_control(link); @@ -966,7 +965,6 @@ activate_link(struct session *ses, struct document_view *doc_view, enum frame_event_status enter(struct session *ses, struct document_view *doc_view, int do_reload) { - enum frame_event_status ret; struct link *link; assert(ses && doc_view && doc_view->vs && doc_view->document); @@ -975,12 +973,10 @@ enter(struct session *ses, struct document_view *doc_view, int do_reload) link = get_current_link(doc_view); if (!link) return FRAME_EVENT_REFRESH; - ret = activate_link(ses, doc_view, link, do_reload); - if (ret != FRAME_EVENT_IGNORED) - if (!current_link_evhook(doc_view, SEVHOOK_ONCLICK)) - return FRAME_EVENT_REFRESH; - return ret; + if (!current_link_evhook(doc_view, SEVHOOK_ONCLICK)) + return FRAME_EVENT_REFRESH; + return activate_link(ses, doc_view, link, do_reload); } struct link *