From 163286662b3061416dffa6c9cde8452e2776c196 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 23 May 2019 15:54:07 +0000
Subject: [PATCH] Bug 22979: Remove type attribute from script tags:
 Authorities

This patch removes the "type" attribute from <script> tags in several
authorities templates. Also removed: Obsolete "//<![CDATA[ //]]>"
markers.

To test, apply the patch and confirm that examples of affected pages
work properly without any JavaScript errors in the browser console:

 - Authorities -> Search -> View authority record
 - Authorities -> Search -> Edit authority record
 - Cataloging -> New record
   - Trigger the authority search form by clicking the plugin link next
     to a tag which has been linked to an authority type (e.g. 100a ->
     Personal name).
   - Search for an authority record.
   - Select an authority record.

Validating the HTML source of any of these pages should return no errors
related to the "type" attribute.

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt    | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt    | 4 +---
 .../prog/en/modules/authorities/blinddetail-biblio-search.tt          | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt         | 2 +-
 .../prog/en/modules/authorities/searchresultlist-auth.tt              | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
index 493703b5b9f..621e5d78e51 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
@@ -13,7 +13,7 @@
 [% INCLUDE 'auth-finder-search.inc' %]
 
 [% MACRO jsinclude BLOCK %]
-    <script type="text/javascript">
+    <script>
         var index = "[% index | html %]";
         var authtypecode = "[% authtypecode | html %]";
     </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
index d16e587ceba..51f4b2af843 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -6,8 +6,7 @@
 [% Asset.js("lib/hc-sticky.js") | $raw %]
 [% Asset.js("js/cataloging.js") | $raw %]
 
-<script type="text/javascript">
-//<![CDATA[
+<script>
     $(window).load(function(){
         $("#loading").hide();
     });
@@ -157,7 +156,6 @@ function confirmnotdup(redirect){
     $("#confirm_not_duplicate").attr("value","1");
     Check();
 }
-//]]>
 </script>
 [% Asset.css("css/addbiblio.css") | $raw %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
index 2b022d6acef..b9635b372a2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt
@@ -16,7 +16,7 @@
         </div>
 
 [% MACRO jsinclude BLOCK %]
-    <script type="text/javascript">
+    <script>
         $(document).ready(function(){
             [% IF rancor %]
             function RancorReplaceField( new_text, ind_1, ind_2 ){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
index 0739df4e5fb..9fddd719090 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
@@ -104,7 +104,7 @@
     [% IF ( displayhierarchy ) %]
         [% Asset.js("lib/jquery/plugins/jquery.jstree.js") | $raw %]
     [% END %]
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             $('#authoritiestabs').tabs();
             [% IF ( displayhierarchy ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
index b50ebbc9afe..21c6e24f053 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
@@ -87,12 +87,12 @@
     </div>
 
 [% MACRO jsinclude BLOCK %]
-    <script type="text/javascript">
+    <script>
         var index = "[% index | html %]";
         var authtypecode = "[% authtypecode | html %]";
     </script>
     [% Asset.js("js/auth-finder-search.js") | $raw %]
-    <script type="text/javascript">
+    <script>
 
         function jumpfull(page){
             window.open(page,'','width=100,height=100,resizable=yes,toolbar=false,scrollbars=yes,top');
-- 
2.11.0