From dbfd3517f4ddea4324aa16c76e180c1ffe955ba7 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 12 Apr 2012 11:16:20 -0400
Subject: [PATCH] Bug 7948 - Printing transfer slip loses barcode field focus

  * Refocus on barcode field after running Dopop()
  * Cleaned up javascript, removed tabs

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes t xt
works as advertised.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../prog/en/modules/circ/returns.tt           | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index d5e1b98a0f..835724fc48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -5,40 +5,42 @@
 <script type="text/javascript">
 //<![CDATA[
 function Dopop(link) {
-    var newin=window.open(link,'popup','width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
+    var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
+    $("#barcode").focus();
 }
-	 $(document).ready(function() {
-	 	$("#exemptcheck").change(function(){
-			if(this.checked == true) {
-				$("#barcode").addClass("alert");
-				$("#exemptfines").show();
-			} else {
-				$("#barcode").removeClass("alert");
-				$("#exemptfines").hide();
-			}
-			$("#barcode").focus();
-		});
-	 	$("#dropboxcheck").change(function(){
-			if (this.checked == true) {
-				$("#barcode").addClass("alert");
-				$("#dropboxmode").show();
-			} else {
-				$("#barcode").removeClass("alert");
-				$("#dropboxmode").hide();
-			}
-			$("#barcode").focus();
-		});
-		[% IF ( overduecharges ) %]$("#barcode").focus(function(){
-			if(($("#exemptcheck").attr("checked") == true)||($("#dropboxcheck").attr("checked") == true)){
-				$("#barcode").addClass("alert");
-			} else {
-				$("#barcode").removeClass("alert");
-			}
-		});
-		$("#barcode").blur(function(){
-			$("#barcode").removeClass("alert");
-		});[% END %]
-	 });
+$(document).ready(function () {
+    $("#exemptcheck").change(function () {
+        if (this.checked == true) {
+            $("#barcode").addClass("alert");
+            $("#exemptfines").show();
+        } else {
+            $("#barcode").removeClass("alert");
+            $("#exemptfines").hide();
+        }
+        $("#barcode").focus();
+    });
+    $("#dropboxcheck").change(function () {
+        if (this.checked == true) {
+            $("#barcode").addClass("alert");
+            $("#dropboxmode").show();
+        } else {
+            $("#barcode").removeClass("alert");
+            $("#dropboxmode").hide();
+        }
+        $("#barcode").focus();
+    });
+    [% IF(overduecharges) %] $("#barcode").focus(function () {
+        if (($("#exemptcheck").attr("checked") == true) || ($("#dropboxcheck").attr("checked") == true)) {
+            $("#barcode").addClass("alert");
+        } else {
+            $("#barcode").removeClass("alert");
+        }
+    });
+    $("#barcode").blur(function () {
+        $("#barcode").removeClass("alert");
+    });
+    [% END %]
+});
 //]]>
 </script>
 </head>
-- 
2.39.5