From b08444d31c663345d04011c061585c53d99076c5 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 20 Oct 2020 15:38:21 +0000
Subject: [PATCH] Bug 26753: Set focus for cursor to password field on
 Overdrive login popup on OPAC

This patch modifies the OverDrive login process so that clicking the
"Log in to your OverDrive account" link automatically puts the focus on
the password field when the modal displays.

Unrelated change: A redundant "document.ready" function has been
removed.

To test you must have OverDrive credentials set in system preferences.

 - Log in to the OPAC.
 - On the "Your summary" page, open the "OverDrive account" tab.
 - Click the "Log in to your OverDrive account" link.
 - A modal dialog should appear, and the cursor focus should
   automatically be on the password field.

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../opac-tmpl/bootstrap/en/includes/overdrive-login.inc     | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js               | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-login.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-login.inc
index 7e9bcba8e4..cf3ea1912d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-login.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-login.inc
@@ -11,7 +11,7 @@
                 <div class="modal-body">
                         <fieldset class="brief">
                             <label for="ODpassword">Password:</label>
-                            <input type="password" name="ODpassword" value="" />
+                            <input type="password" name="ODpassword" id="ODpassword" value="" />
                         </fieldset>
                 </div>
                 <div class="modal-footer">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js b/koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js
index bafb61a712..6f586e069f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js
+++ b/koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js
@@ -95,9 +95,11 @@ KOHA.OverDriveCirculation = new function() {
             var ODpassword = $("input[name='ODpassword']").val();
             login( ODpassword );
         });
-    });
 
-    $( document ).ready(function() {
+        $("#overdrive-login").on("shown.bs.modal", function(){
+            $("#ODpassword").focus();
+        });
+
         var p = window.opener;
         var cb;
         if (p) {
-- 
2.39.5