From 6d5a9740ae15ec9a59448fd9e753eb9b0471bf3d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 30 Jan 2013 15:19:58 +0100 Subject: [PATCH] Bug 9507: prevent submit: refactor some code in a js file Content-Type: text/plain; charset=utf-8 This patch refactores code in a js file. Test plan: On acqui/neworderempty.pl, acqui/orderreceive.pl and serials/serials-edit.tt try to scan a barcode (or press enter) on the form and check that it is not sent. Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Have to note that the code for IE9 does not work. Before and after this patch. If we refactor code, it would have been nice to resolve this too. But I do not oppose pushing this patch. The test uses 'an ancient Netscape property' window.Event (uppercase!) to make the distinction between browers and event models. Some more documentation here would be welcome too. --- .../intranet-tmpl/prog/en/js/prevent_submit.js | 18 ++++++++++++++++++ .../prog/en/modules/acqui/neworderempty.tt | 19 +------------------ .../prog/en/modules/acqui/orderreceive.tt | 20 +------------------- .../prog/en/modules/serials/serials-edit.tt | 19 +------------------ 4 files changed, 21 insertions(+), 55 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/prevent_submit.js diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/prevent_submit.js b/koha-tmpl/intranet-tmpl/prog/en/js/prevent_submit.js new file mode 100644 index 0000000..bafd42a --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/js/prevent_submit.js @@ -0,0 +1,18 @@ +var prevent_nav = window.Event ? true : false; +if (prevent_nav) { + window.captureEvents(Event.KEYDOWN); + window.onkeydown = NetscapeEventHandler_KeyDown; +} else { + document.onkeydown = IEEventHandler_KeyDown; +} + +function NetscapeEventHandler_KeyDown(e) { + if (e.which == 13 && e.target.type != 'textarea' && e.target.type != 'submit') { return false; } + return true; +} + +function IEEventHandler_KeyDown() { + if (event.keyCode == 13 && event.srcElement.type != 'textarea' && event.srcElement.type != 'submit') + return false; + return true; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index cc554ed..87cfa8a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -6,25 +6,8 @@ [% INCLUDE 'additem.js.inc' %] + + +