From 5f7a2c92138ee44cf24d14cb52602bd490b89f2d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 25 Oct 2018 15:24:29 +0000 Subject: [PATCH] Bug 21186: (follow-up) Incorrect Bootstrap modal event name in multiple templates This patch addresses a few more instances of this problem which I didn't catch in my first pass. To test, apply the patch and clear your browser cache if necessary. - Go to Circulation -> Check in and check in an item which has a hold. - When the 'Hold found' modal appears the checkin barcode field behind it should be disabled. - When the modal is dismissed the checkin field should be enabled again and focus should be on that field. - Go to Administration -> Library groups. - Click the "Add group" button. The cursor focus should be on the title field. - Go to Tools -> MARC modification templates. - Click the "New template" button. The cursor focus should be on the name field. Signed-off-by: Cori Lynn Arnold Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit b94399131614a304b3a0282ec8a85194cc72b3cf) Signed-off-by: Martin Renvoize --- .../intranet-tmpl/prog/en/modules/admin/library_groups.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 4 ++-- .../intranet-tmpl/prog/js/marc_modification_templates.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt index b9b433ffe0..9dc7d393e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt @@ -52,7 +52,7 @@ $('#add-group-modal-description').val(""); $('#add-group-modal-title').val(""); - $('#add-group-modal').on('shown', function() { + $('#add-group-modal').on('shown.bs.modal', function() { $('#add-group-modal-title').focus(); }); @@ -84,7 +84,7 @@ $('#root-group-features-edit').show(); } - $('#edit-group-modal').on('shown', function() { + $('#edit-group-modal').on('shown.bs.modal', function() { $('#edit-group-modal-title').focus(); }); 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 9ea80316f1..a35b3bffde 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -705,9 +705,9 @@ $("#barcode").focus(); } $(document).ready(function () { - $(".modal").modal({ backdrop: 'static' }).on('shown', function() { + $(".modal").modal({ backdrop: 'static' }).on('shown.bs.modal', function() { $("#barcode").prop("disabled", true); - }).on('hidden', function() { + }).on('hidden.bs.modal', function() { $("#barcode").prop("disabled", false).focus(); }); diff --git a/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js b/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js index 8ca256be10..1d4659fa10 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js +++ b/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js @@ -61,7 +61,7 @@ $(document).ready(function() { $("#duplicate_current_template").val(1); }); - $('#createTemplate').on('shown', function (e) { + $('#createTemplate').on('shown.bs.modal', function (e) { e.preventDefault(); $("#template_name").focus(); }); -- 2.20.1