From 2fba705a0b45b1192578de71c969f056a77bd789 Mon Sep 17 00:00:00 2001 From: Paul Gardiner Date: Thu, 9 Aug 2012 15:12:05 +0100 Subject: Forms: move js-side event setup out of execute_action Makes it easier to alter the setup for some action types --- pdf/pdf_form.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pdf/pdf_form.c b/pdf/pdf_form.c index b505de25..68559ac8 100644 --- a/pdf/pdf_form.c +++ b/pdf/pdf_form.c @@ -1498,11 +1498,6 @@ static void execute_action(pdf_document *doc, pdf_obj *obj, pdf_obj *a) char *code = pdf_to_utf8(doc, js); fz_try(ctx) { - pdf_js_event e; - - e.target = obj; - e.value = pdf_field_getValue(doc, obj); - pdf_js_setup_event(doc->js, &e); pdf_js_execute(doc->js, code); } fz_always(ctx) @@ -1566,6 +1561,11 @@ void pdf_update_appearance(pdf_document *doc, pdf_obj *obj) if (formatting) { /* Apply formatting */ + pdf_js_event e; + + e.target = obj; + e.value = pdf_field_getValue(doc, obj); + pdf_js_setup_event(doc->js, &e); execute_action(doc, obj, formatting); /* Update appearance from JS event.value */ update_text_appearance(doc, obj, pdf_js_get_event(doc->js)->value); @@ -1875,6 +1875,11 @@ static void recalculate(pdf_document *doc) if (calc) { + pdf_js_event e; + + e.target = field; + e.value = pdf_field_getValue(doc, field); + pdf_js_setup_event(doc->js, &e); execute_action(doc, field, calc); /* A calculate action, updates event.value. We need * to place the value in the field */ -- cgit v1.2.3