From cd684fa301ed71c762825fcc0ed739e17f99342f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 28 Feb 2014 14:48:36 -0500 Subject: [PATCH] [PASSED QA] Bug 11877 - Eliminate use of deprecated jQuery .live() method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As of jQuery 1.9 the .live() method has been removed. A few templates contain JavaScript which uses it. It can be easily replaced with .on(). This patch makes the correction. To test, apply the patch and test the following pages: - In the staff client, Administration -> OAI sets configuration: Define mappings for an existing set. You should be able to add rows by clicking the "OR" button. You should be able to delete or clear any line by clicking the "Delete" link. - In the staff client, view the details for any patron and click the "Change password" button: In the change password form click the link to fill the password fields with a random password. This link should work correctly. - If necessary enable OpacRenewalAllowed in system preferences. Log in to the OPAC as a patron who has checkouts. On the patron summary page (opac-user.pl) look for the "renew selected" and "renew all" links at the top of the table of checkouts. Both these links should work correctly. Test in prog and bootstrap themes. Followed test plan. Same behaviour as without patch, i.e. patch OK Signed-off-by: Marc Véron Signed-off-by: Katrin Fischer Passes all tests and QA script, works as described. No Javasript errors found. Note: The buttons on the form show up, even if no item shows the checkbox. In my case the problem was that I had 0 renewals allowed in the circulation rules. Maybe we could hide them, if no item can be renewed. --- .../intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt | 9 +++++---- .../intranet-tmpl/prog/en/modules/members/member-password.tt | 7 ++++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 6 ++++-- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 4 ++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt index c4a9b87..60469b8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt @@ -7,11 +7,12 @@ $(document).ready(function() { $("#mappingform").submit(function(){ hideDialogBox(); }); - $("#ORbutton").live("click", function(){ - newCondition(); - return false; + $("body").on("click","#ORbutton", function(e){ + e.preventDefault(); + newCondition(); }); - $(".clear-field").live("click",function(e){ + $("body").on("click",".clear-field",function(e){ + e.preventDefault(); clearRow(e.target); }); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt index eb69430..d035a6d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt @@ -12,7 +12,8 @@ return true; } }); - $("#fillrandom").live('click', function() { + $("body").on('click', "#fillrandom",function(e) { + e.preventDefault(); $("#newpassword").after("").remove(); $("#newpassword2").after("").remove(); }); @@ -28,7 +29,7 @@
- +
@@ -40,7 +41,7 @@ [% ELSE %]
- + [% IF ( errormsg ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 9cd47df..3a58bf7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -661,10 +661,12 @@ } return valid; }); - $("#renewselected_link").live('click',function(){ + $("body").on("click","#renewselected_link",function(e){ + e.preventDefault(); $("#renewselected").submit(); }); - $("#renewall_link").live('click',function(){ + $("body").on("click","#renewall_link",function(e){ + e.preventDefault(); $("#renewall").submit(); }); $("#checkoutst caption").append(""); diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt index 62a852b..16b88b1 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt @@ -40,10 +40,10 @@ var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended } return valid; }); - $("#renewselected_link").live('click',function(){ + $("body").on("click","#renewselected_link",function(){ $("#renewselected").submit(); }); - $("#renewall_link").live('click',function(){ + $("body").on("click","#renewall_link",function(){ $("#renewall").submit(); }); $("#checkoutst caption").append("");[% END %] -- 1.8.3.2