Attachment 18726 Details for Bug 9507 – [3.8.x] Bug 9507: prevent submit: refactor some code in a js file

[patch] [3.8.x] Bug 9507: prevent submit: refactor some code in a js file

Bug-9507-prevent-submit-refactor-some-code-in-a-js.patch (text/plain), 4.61 KB, created by Jonathan Druart on 2013-06-07 08:55:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2013-06-07 08:55:59 UTC

Size: 4.61 KB

patch

obsolete

>From eeabb85eead9d2fe2e0f85a6c8aec95b010635df Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Wed, 30 Jan 2013 15:19:58 +0100
>Subject: [PATCH] Bug 9507: prevent submit: refactor some code in a js file
>
>This patch refactors some 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 <kyle@bywatersolutions.com>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>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           |    1 +
> .../prog/en/modules/serials/serials-edit.tt         |    1 +
> 4 files changed, 21 insertions(+), 18 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 c9eda4f..4ab6151 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 @@
> <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
> [% INCLUDE 'additem.js.inc' %]
> <script type="text/javascript" src="[% themelang %]/js/additem.js"></script>
>+<script type="text/javascript" src="[% themelang %]/js/prevent_submit.js"></script>
> <script type="text/javascript">
>-var nav = window.Event ? true : false;
>-if (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;
>-}
> //<![CDATA[
> actTotal = "";
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>index ae030e2..54e3d9b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>@@ -3,6 +3,7 @@
> [% INCLUDE 'doc-head-close.inc' %]
> [% INCLUDE 'additem.js.inc' %]
> <script type="text/javascript" src="[% themelang %]/js/additem.js"> </script>
>+<script type="text/javascript" src="[% themelang %]/js/prevent_submit.js"></script>
> <script type="text/javascript">
> //<![CDATA[
>     function Check(form) {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>index b41bf39..771c2f4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>@@ -1,6 +1,7 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Serials &rsaquo; Serial edition [% bibliotitle %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>+<script type="text/javascript" src="[% themelang %]/js/prevent_submit.js"></script>
> <script language="JavaScript" type="text/javascript">
> //<![CDATA[
> function popup(subscriptionid) {
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 9507: 14947 | 15015 | 18305 | 18309 | 18310 | 18726