From c84d9f8bcbb8264ff170c43b216224bea204029d Mon Sep 17 00:00:00 2001 From: David Cook Date: Tue, 22 Apr 2025 01:27:15 +0000 Subject: [PATCH] Bug 39567: Run JS change in separate file ESM as per JS1 As per JS1 in the coding guidelines, I've moved the inline JS from the template into a separate file. --- koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc | 8 +------- koha-tmpl/intranet-tmpl/prog/js/form-submit.js | 7 ++++++- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 8 +------- koha-tmpl/opac-tmpl/bootstrap/js/form-submit.js | 7 ++++++- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc index d60d163ede..d968eb8286 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc @@ -26,13 +26,7 @@ [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %] [% Asset.js("js/staff-global.js") | $raw %] - +[% Asset.js("js/form-submit.js",{'type' => 'module'}) | $raw %] [% INCLUDE 'js-date-format.inc' %] [% INCLUDE 'js-patron-get-age.inc' %] [% INCLUDE 'js-patron-format-address.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/form-submit.js b/koha-tmpl/intranet-tmpl/prog/js/form-submit.js index 30855ff297..bcaaaa72ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/form-submit.js +++ b/koha-tmpl/intranet-tmpl/prog/js/form-submit.js @@ -1,4 +1,4 @@ -export function submit_form(form) { +function submit_form(form) { let form_data = $(form).data(); let confirm_msg = form_data.confirmationMsg; @@ -33,3 +33,8 @@ export function submit_form(form) { $("body").append(the_form); the_form.submit(); } + +$("body").on("click", ".submit-form-link", function (e) { + e.preventDefault(); + submit_form(this); +}); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index 020557af38..8b2fd7368a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -102,13 +102,7 @@ let logged_in_user_id = "[% logged_in_user.borrowernumber | html %]"; [% Asset.js("js/global.js") | $raw %] - +[% Asset.js("js/form-submit.js",{'type' => 'module'}) | $raw %] [% IF ( OPACAmazonCoverImages || SyndeticsCoverImages ) %] [% Asset.js("js/amazonimages.js") | $raw %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/form-submit.js b/koha-tmpl/opac-tmpl/bootstrap/js/form-submit.js index 30855ff297..bcaaaa72ca 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/js/form-submit.js +++ b/koha-tmpl/opac-tmpl/bootstrap/js/form-submit.js @@ -1,4 +1,4 @@ -export function submit_form(form) { +function submit_form(form) { let form_data = $(form).data(); let confirm_msg = form_data.confirmationMsg; @@ -33,3 +33,8 @@ export function submit_form(form) { $("body").append(the_form); the_form.submit(); } + +$("body").on("click", ".submit-form-link", function (e) { + e.preventDefault(); + submit_form(this); +}); -- 2.34.1