From fc14fa59be0a918ffd0a205bb44117a1f8902062 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Wed, 6 May 2015 23:19:43 -0400 Subject: [PATCH] Bug 11270: Search Result highlighting should be refactored (master) Whilst working on Bug 6149 I found there to be many repeats of code in different file relating to the search highlighting. This patch tries to factor out some of the code into include's to enhance maintainability. This is just the bootstrap portions. Untested. This should apply. However, Martin Renvoize has yet to post a test plan. --- .../bootstrap/en/includes/opac-highlight.inc | 26 ++++++++++++++++++++++ .../bootstrap/en/modules/opac-results-grouped.tt | 17 -------------- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 26 ++-------------------- 3 files changed, 28 insertions(+), 41 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-highlight.inc diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-highlight.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-highlight.inc new file mode 100644 index 0000000..9d24a2d --- /dev/null +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-highlight.inc @@ -0,0 +1,26 @@ + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt index 05d022a..2220c3c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt @@ -335,23 +335,6 @@ $(document).ready(function(){ $("#highlight_toggle_off").show().click(function() {highlightOff();}); [% END %] }); - -function highlightOff() { - $("td").removeHighlight(); - $(".highlight_toggle").toggle(); -} -function highlightOn() { - var x; - for (x in q_array) { - q_array[x] = q_array[x].replace(/\w*:([\w])/, "$1"); - q_array[x] = q_array[x].toLowerCase(); - var myStopwords = "[% Koha.Preference('NotHighlightedWords') %]".toLowerCase().split('|'); - if ( (q_array[x].length > 0) && ($.inArray(q_array[x], myStopwords) == -1) ) { - $("td").highlight(q_array[x]); - } - } - $(".highlight_toggle").toggle(); -} //]]> [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 27c5a10..5fa03b8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -583,8 +583,8 @@ [% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %][% END %] [% IF ( OverDriveEnabled ) %][% END %] -[% IF ( OpacHighlightedWords ) %] -[% END %]