From e20471de578e84e24ce228058ba8b7a503517035 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
Content-Type: text/plain; charset=utf-8

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          |   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 @@
 <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 9e16755..a65236d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -3,26 +3,8 @@
 [% 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">
-
-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[
     function Check(form) {
         [% IF (AcqCreateItemReceiving) %]
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 5c8c80c..1bc9cf5 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
@@ -2,25 +2,8 @@
 <title>Koha &rsaquo; Serials &rsaquo; Serial edition [% bibliotitle %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
+<script type="text/javascript" src="[% themelang %]/js/prevent_submit.js"></script>
 <script language="JavaScript" 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[
 function generateReceive() {
     var subscriptionid =  document.getElementsByName("subscriptionid")[0].value;
-- 
1.7.7.6