From 3bc490fbe79102f1a91e771b36ababb5ccffc642 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 3 Feb 2022 17:38:44 +0000 Subject: [PATCH] Bug 29155: Update links to jQuery and jQuery Migrate files With these patches, jQuery versions in the OPAC and staff interface are both updated to 3.6.0. The latest version of jQuery Migrate is installed to allow us to take a slower approach to updating out-of-date syntax. To test, apply the patch and try as many pages as you can, paying attention to the browser console to watch for errors. --- .../prog/en/includes/installer-intranet-bottom.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt | 4 ++-- koha-tmpl/opac-tmpl/xslt/OAI.xslt | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc index 99f4c44221..e39b78efe6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc @@ -1,7 +1,7 @@ [% USE raw %] [% USE Asset %] - [% Asset.js("lib/jquery/jquery-2.2.3.min.js") | $raw %] - [% Asset.js("lib/jquery/jquery-migrate-1.3.0.min.js") | $raw %] + [% Asset.js("lib/jquery/jquery-3.6.0.min.js") | $raw %] + [% Asset.js("lib/jquery/jquery-migrate-3.3.2.min.js") | $raw %] [% Asset.js("lib/jquery/jquery-ui-1.13.1.min.js") | $raw %] [% Asset.js("lib/bootstrap/bootstrap.min.js") | $raw %] [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc index b419b9ab9f..7c99d2544c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc @@ -16,8 +16,8 @@ [% END %] -[% Asset.js("lib/jquery/jquery-2.2.3.min.js") | $raw %] -[% Asset.js("lib/jquery/jquery-migrate-1.3.0.min.js") | $raw %] +[% Asset.js("lib/jquery/jquery-3.6.0.min.js") | $raw %] +[% Asset.js("lib/jquery/jquery-migrate-3.3.2.min.js") | $raw %] [% Asset.js("lib/jquery/jquery-ui-1.13.1.min.js") | $raw %] [% Asset.js("lib/shortcut/shortcut.js") | $raw %] [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt index a7ec58df2e..6bd4070125 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt @@ -9,8 +9,8 @@ CACHE: [% interface | html %]/lib/bootstrap/bootstrap.min.js [% interface | html %]/lib/jquery/jquery-ui-1.13.1.min.css [% interface | html %]/lib/jquery/jquery-ui-1.13.1.min.js -[% interface | html %]/lib/jquery/jquery-2.2.3.min.js -[% interface | html %]/lib/jquery/jquery-migrate-1.3.0.min.js +[% interface | html %]/lib/jquery/jquery-3.6.0.min.js +[% interface | html %]/lib/jquery/jquery-migrate-3.3.2.min.js [% interface | html %]/lib/jquery/plugins/jquery.cookie.min.js [% interface | html %]/lib/jquery/plugins/jquery.highlight-3.js [% interface | html %]/lib/shortcut/shortcut.js diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt index ae1838d6d2..eac2ff3fbe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt @@ -30,8 +30,8 @@ [% END %] -[% Asset.js( "lib/jquery/jquery-2.2.3.min.js" ) | $raw %] -[% Asset.js( "lib/jquery/jquery-migrate-1.3.0.min.js" ) | $raw %] +[% Asset.js( "lib/jquery/jquery-3.6.0.min.js" ) | $raw %] +[% Asset.js( "lib/jquery/jquery-migrate-3.3.2.min.js" ) | $raw %] [% IF ( autoprint ) %] [% INCLUDE 'slip-print.inc' #printThenClose %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index 769b79da57..2d61b53590 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -118,8 +118,8 @@ [% END # / UNLESS is_popup %] -[% Asset.js("lib/jquery/jquery-3.4.1.min.js") | $raw %] -[% Asset.js("lib/jquery/jquery-migrate-3.1.0.min.js") | $raw %] +[% Asset.js("lib/jquery/jquery-3.6.0.min.js") | $raw %] +[% Asset.js("lib/jquery/jquery-migrate-3.3.2.min.js") | $raw %] [% Asset.js("lib/jquery/jquery-ui-1.13.1.min.js") | $raw %] [% Asset.js("lib/bootstrap/js/bootstrap.bundle.min.js") | $raw %] [% Asset.js("lib/fontfaceobserver.min.js") | $raw %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt index 8f293f0a82..be7add462e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt @@ -15,8 +15,8 @@ [% END %] -[% Asset.js("lib/jquery/jquery-3.4.1.min.js") | $raw %] -[% Asset.js("lib/jquery/jquery-migrate-3.1.0.min.js") | $raw %] +[% Asset.js("lib/jquery/jquery-3.6.0.min.js") | $raw %] +[% Asset.js("lib/jquery/jquery-migrate-3.3.2.min.js") | $raw %] [% Asset.js("lib/fontfaceobserver.min.js") | $raw %] [% Asset.js("lib/enquire.min.js") | $raw %] [% Asset.js("js/global.js") | $raw %] diff --git a/koha-tmpl/opac-tmpl/xslt/OAI.xslt b/koha-tmpl/opac-tmpl/xslt/OAI.xslt index 6242a21a7b..48a31309f5 100644 --- a/koha-tmpl/opac-tmpl/xslt/OAI.xslt +++ b/koha-tmpl/opac-tmpl/xslt/OAI.xslt @@ -26,8 +26,8 @@ Koha OAI-PMH Data Provider - - + + -- 2.20.1