From 0b2bb44b77df5d7ea2cde326ca3d9945cf13a244 Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Fri, 25 Aug 2023 11:56:08 +0000 Subject: [PATCH] Bug 33537: (QA follow-up) Use bootstrap modal native functions Content-Type: text/plain; charset=utf-8 Signed-off-by: Pedro Amorim Signed-off-by: Marcel de Rooy --- koha-tmpl/intranet-tmpl/prog/js/domain_limits.js | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/domain_limits.js b/koha-tmpl/intranet-tmpl/prog/js/domain_limits.js index 69ddb768d4..5ae049fb3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/domain_limits.js +++ b/koha-tmpl/intranet-tmpl/prog/js/domain_limits.js @@ -25,12 +25,6 @@ $(document).ready(function() { api_delete( limit_id ); } }); - $('#domain_limits_modal').on( 'keydown', function(ev) { - if ( ev.which == 27 ) { // respond to escape key - $('#domain_limits_modal').hide(); - return false; - } - }); $('#domain_limits_modal button.save').on( 'click', function() { if ( !$('#domain_limits_modal form').get(0).checkValidity() ) return; // Do not return false here to allow validation. var limit_id = $('#domain_limits_modal .modal-form').data('id'); @@ -38,10 +32,6 @@ $(document).ready(function() { if ( limit_id ) api_put(limit_id, row); else api_post(row); return false; }); - $('#domain_limits_modal button.cancel').on( 'click', function() { - $('#domain_limits_modal').hide(); - return false; - }); }); function api_get (limit_id) { @@ -81,7 +71,7 @@ function api_post (row) { }).fail(function (xhr, status, error) { status_message( 'post', xhr.status, row ); }).always(function () { - $('#domain_limits_modal').hide(); + $('#domain_limits_modal').modal('hide'); });; } @@ -97,7 +87,7 @@ function api_put (limit_id, row) { }).fail(function (xhr, status, error) { status_message( 'put', xhr.status, row ); }).always(function () { - $('#domain_limits_modal').hide(); + $('#domain_limits_modal').modal('hide'); }); } @@ -189,7 +179,7 @@ function start_modal (action, row) { } else { fill_modal_inputs(action, row); } - $('#domain_limits_modal').show().find('input')[0].focus(); + $('#domain_limits_modal').modal('show').find('input')[0].focus(); } function init_table () { -- 2.30.2