From d4f1afecf45e4f582ffa5904bd0d6034402703ce Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 4 Mar 2014 08:19:57 -0500 Subject: [PATCH] [Signed-off] Bug 11878 - Eliminate use of deprecated jQuery .toggle() method usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit jQuery's .toggle() method can no longer be used to trigger a pair of specified functions. .toggle() can only be used to change the visibility of an element. This patch fixes a few places in Koha where the deprecated functionality was used. To test, apply the patch and clear your browser cache. - View the system preferences page in the staff client. Clicking a heading ("Appearance" under OPAC preferences, for instance) should collapse that section. Clicking again should expand it. - View the MARC detail page for a record in the OPAC. Clicking the "view plain" link should display the plain MARC view. Clicking the "view labeled" view should return to the original view. Test in both prog and bootstrap themes. Signed-off-by: wajasu Followed test plan. Works fine. Signed-off-by: Marc Véron --- .../intranet-tmpl/prog/en/js/pages/preferences.js | 14 ++++----- .../bootstrap/en/modules/opac-MARCdetail.tt | 33 +++++++++++--------- .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt | 33 +++++++++++--------- 3 files changed, 43 insertions(+), 37 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js b/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js index 8fe6369..80b8429 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js @@ -95,16 +95,16 @@ $( document ).ready( function () { $("h3").attr("class","expanded").attr("title",MSG_CLICK_TO_EXPAND); var collapsible = $(".collapsed,.expanded"); - $(collapsible).toggle( - function () { + $(collapsible).on("click",function(){ + var panel = $(this).next("div"); + if(panel.is(":visible")){ $(this).addClass("collapsed").removeClass("expanded").attr("title",MSG_CLICK_TO_EXPAND); - $(this).next("div").hide(); - }, - function () { + panel.hide(); + } else { $(this).addClass("expanded").removeClass("collapsed").attr("title",MSG_CLICK_TO_COLLAPSE); - $(this).next("div").show(); + panel.show(); } - ); + }); if ( to_highlight ) { var words = to_highlight.split( ' ' ); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt index d731c7d..004eecd 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt @@ -182,23 +182,26 @@ $(document).ready(function(){ }); var loaded = 0; - $("#switchview").toggle( - function () { - $(this).text(_("view labeled")); - $("#labeledmarc").hide(); - if(!loaded){ - $("#plainmarc").show().html("
"+_("Loading")+"...
").load("/cgi-bin/koha/opac-showmarc.pl","id=[% biblionumber %]&viewas=html"); - loaded = 1; + var toggle = 0; + $("#switchview").on("click",function(e){ + e.preventDefault(); + if( toggle == 0){ + $(this).text(_("view labeled")); + $("#labeledmarc").hide(); + if(!loaded){ + $("#plainmarc").show().html("
"+_("Loading")+"...
").load("/cgi-bin/koha/opac-showmarc.pl","id=[% biblionumber %]&viewas=html"); + loaded = 1; + } else { + $("#plainmarc").show(); + } + toggle = 1; } else { - $("#plainmarc").show(); + $(this).text(_("view plain")); + $("#labeledmarc").show(); + $("#plainmarc").hide(); + toggle = 0; } - }, - function () { - $(this).text(_("view plain")); - $("#labeledmarc").show(); - $("#plainmarc").hide(); - } - ); + }); }); [% END %] //]]> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt index 6e57f08..ee097fd 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt @@ -33,23 +33,26 @@ $(document).ready(function(){ }); var loaded = 0; - $("#switchview").toggle( - function () { - $(this).text(_("view labeled")); - $("#labeledmarc").hide(); - if(!loaded){ - $("#plainmarc").show().html("
"+_("Loading")+"...
").load("/cgi-bin/koha/opac-showmarc.pl","id=[% biblionumber %]&viewas=html"); - loaded = 1; + var toggle = 0; + $("#switchview").on("click",function(e){ + e.preventDefault(); + if( toggle == 0){ + $(this).text(_("view labeled")); + $("#labeledmarc").hide(); + if(!loaded){ + $("#plainmarc").show().html("
"+_("Loading")+"...
").load("/cgi-bin/koha/opac-showmarc.pl","id=[% biblionumber %]&viewas=html"); + loaded = 1; + } else { + $("#plainmarc").show(); + } + toggle = 1; } else { - $("#plainmarc").show(); + $(this).text(_("view plain")); + $("#labeledmarc").show(); + $("#plainmarc").hide(); + toggle = 0; } - }, - function () { - $(this).text(_("view plain")); - $("#labeledmarc").show(); - $("#plainmarc").hide(); - } - ); + }); }); [% END %] //]]> -- 1.7.10.4