From e8c656374879fb9f9e0f2e8061ea8db37920b40e Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Mon, 10 Jun 2019 13:34:18 +0000 Subject: [PATCH] Bug 14794: (follow-up) Add tooltip to filter box --- koha-tmpl/intranet-tmpl/prog/js/members-menu.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js b/koha-tmpl/intranet-tmpl/prog/js/members-menu.js index ad39b990cb..c6e751b0f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js +++ b/koha-tmpl/intranet-tmpl/prog/js/members-menu.js @@ -1,6 +1,7 @@ /* global borrowernumber advsearch dateformat _ CAN_user_borrowers_edit_borrowers number_of_adult_categories destination Sticky MSG_DATE_FORMAT_US MSG_DATE_FORMAT_ISO MSG_DATE_FORMAT_METRIC MSG_DATE_FORMAT_DMYDOT MSG_CONFIRM_UPDATE_CHILD MSG_CONFIRM_RENEW_PATRON */ $(document).ready(function(){ + $("#filteraction_off, #filteraction_on").on('click', function(e) { e.preventDefault(); $('#filters').toggle(); @@ -16,9 +17,13 @@ $(document).ready(function(){ $("#filteraction_off").toggle(); } - searchfield_date_tooltip(); + searchfield_date_tooltip(""); + searchfield_date_tooltip('_filter'); $("#searchfieldstype").change(function() { - searchfield_date_tooltip(); + searchfield_date_tooltip(""); + }); + $("#searchfieldstype_filter").change(function() { + searchfield_date_tooltip('_filter'); }); if( CAN_user_borrowers_edit_borrowers ){ @@ -92,9 +97,11 @@ $(document).ready(function(){ }); }); -function searchfield_date_tooltip() { - var MSG_DATE_FORMAT = ""; - if ( $("#searchfieldstype").val() == 'dateofbirth' ) { +function searchfield_date_tooltip(filter) { + var field = "#searchmember" + filter; + var type = "#searchfieldstype" + filter; + if ( $(type).val() == 'dateofbirth' ) { + var MSG_DATE_FORMAT = ""; if( dateformat == 'us' ){ MSG_DATE_FORMAT = MSG_DATE_FORMAT_US; } else if( dateformat == 'iso' ){ @@ -104,9 +111,9 @@ function searchfield_date_tooltip() { } else if( dateformat == 'dmydot' ){ MSG_DATE_FORMAT = MSG_DATE_FORMAT_DMYDOT; } - $('#searchmember').attr("title", MSG_DATE_FORMAT).tooltip('show'); + $(field).attr("title", MSG_DATE_FORMAT).tooltip('show'); } else { - $('#searchmember').tooltip('destroy'); + $(field).tooltip('destroy'); } } -- 2.11.0