From 32251409c638d0d9e12834a9f2998efea2e2e4a0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sun, 3 May 2020 01:04:41 +0000 Subject: [PATCH] Bug 25354: Clean up JavaScript markup in cataloging plugin scripts This patch makes some minor changes to the JavaScript generated by the cataloging plugins: |; }; diff --git a/cataloguing/value_builder/barcode.pl b/cataloguing/value_builder/barcode.pl index 4c7072631c..bf5b0739dd 100755 --- a/cataloguing/value_builder/barcode.pl +++ b/cataloguing/value_builder/barcode.pl @@ -47,7 +47,7 @@ my $builder = sub { warn "Barcode type = $autoBarcodeType" if $DEBUG; if ((not $autoBarcodeType) or $autoBarcodeType eq 'OFF') { # don't return a value unless we have the appropriate syspref set - return q||; + return q||; } if ($autoBarcodeType eq 'annual') { ($nextnum, $scr) = C4::Barcodes::ValueBuilder::annual::get_barcode(\%args); @@ -89,8 +89,7 @@ if (\$('#' + id).val() == '' || force) { END_OF_JS my $js = < -// function Focus$function_name(id, force) { $scr @@ -100,7 +99,6 @@ function Click$function_name(id) { Focus$function_name(id, 1); return false; } -//]]> END_OF_JS return $js; diff --git a/cataloguing/value_builder/barcode_manual.pl b/cataloguing/value_builder/barcode_manual.pl index 1167c7fbc8..91c5f186a8 100755 --- a/cataloguing/value_builder/barcode_manual.pl +++ b/cataloguing/value_builder/barcode_manual.pl @@ -48,7 +48,7 @@ my $builder = sub { warn "Barcode type = $autoBarcodeType" if $DEBUG; if ((not $autoBarcodeType) or $autoBarcodeType eq 'OFF') { # don't return a value unless we have the appropriate syspref set - return q||; + return q||; } if ($autoBarcodeType eq 'annual') { ($nextnum, $scr) = C4::Barcodes::ValueBuilder::annual::get_barcode(\%args); @@ -68,14 +68,12 @@ my $builder = sub { END_OF_JS my $js = < - // function Click$function_name(id) { $scr return false; } - //]]> END_OF_JS return $js; diff --git a/cataloguing/value_builder/callnumber-KU.pl b/cataloguing/value_builder/callnumber-KU.pl index 5cbdd25905..1dce791395 100755 --- a/cataloguing/value_builder/callnumber-KU.pl +++ b/cataloguing/value_builder/callnumber-KU.pl @@ -45,7 +45,7 @@ CCC QW - returns first unused number CCC QWxx starting with CCC QW01 my $builder = sub { my ( $params ) = @_; my $res=" - "; return $res; diff --git a/cataloguing/value_builder/dateaccessioned.pl b/cataloguing/value_builder/dateaccessioned.pl index ab18ee9ec5..9479fb3f9c 100755 --- a/cataloguing/value_builder/dateaccessioned.pl +++ b/cataloguing/value_builder/dateaccessioned.pl @@ -31,7 +31,7 @@ my $builder = sub { my $res = < -// from: cataloguing/value_builder/dateaccessioned.pl +/* from: cataloguing/value_builder/dateaccessioned.pl */ \$(document).ready(function(){ \$("#$function_name").datepicker({ @@ -51,7 +51,7 @@ function Click$function_name(event) { } function set_to_today( id, force ) { - // The force parameter is used in Click but not in Focus ! + /* The force parameter is used in Click but not in Focus ! */ if (! id) { alert(_("Bad id ") + id + _(" sent to set_to_today()")); return 0; } if (\$("#" + id).val() == '' || \$("#" + id).val() == '0000-00-00' || force ) { \$("#" + id).val("$date"); diff --git a/cataloguing/value_builder/macles.pl b/cataloguing/value_builder/macles.pl index bed0c88f66..e3ec7b9c40 100755 --- a/cataloguing/value_builder/macles.pl +++ b/cataloguing/value_builder/macles.pl @@ -30,12 +30,10 @@ my $builder = sub { my ( $params ) = @_; my $function_name = $params->{id}; my $res=" - "; return $res; diff --git a/cataloguing/value_builder/marc21_field_005.pl b/cataloguing/value_builder/marc21_field_005.pl index 4bf4c21755..6b5263163a 100755 --- a/cataloguing/value_builder/marc21_field_005.pl +++ b/cataloguing/value_builder/marc21_field_005.pl @@ -30,18 +30,16 @@ my $builder = sub { my $date = sprintf("%4d%02d%02d%02d%02d%04.1f",@a); my $res = " - "; return $res; }; -return { builder => $builder }; \ No newline at end of file +return { builder => $builder }; diff --git a/cataloguing/value_builder/marc21_field_006.pl b/cataloguing/value_builder/marc21_field_006.pl index aeb5df1949..73e3cd13e8 100755 --- a/cataloguing/value_builder/marc21_field_006.pl +++ b/cataloguing/value_builder/marc21_field_006.pl @@ -33,15 +33,13 @@ my $builder = sub { my ( $params ) = @_; my $function_name = $params->{id}; my $res = " - "; diff --git a/cataloguing/value_builder/marc21_field_007.pl b/cataloguing/value_builder/marc21_field_007.pl index a64f407e59..e59aca3581 100755 --- a/cataloguing/value_builder/marc21_field_007.pl +++ b/cataloguing/value_builder/marc21_field_007.pl @@ -32,15 +32,13 @@ my $builder = sub { my ( $params ) = @_; my $function_name = $params->{id}; my $res = " - "; diff --git a/cataloguing/value_builder/marc21_field_008.pl b/cataloguing/value_builder/marc21_field_008.pl index 4acbb6946f..27a13dcacf 100755 --- a/cataloguing/value_builder/marc21_field_008.pl +++ b/cataloguing/value_builder/marc21_field_008.pl @@ -42,8 +42,7 @@ my $builder = sub { my $function_name = $params->{id}; my $dateentered = date_entered(); my $res = " - "; diff --git a/cataloguing/value_builder/marc21_field_008_authorities.pl b/cataloguing/value_builder/marc21_field_008_authorities.pl index fe109a2498..3e3d756b43 100755 --- a/cataloguing/value_builder/marc21_field_008_authorities.pl +++ b/cataloguing/value_builder/marc21_field_008_authorities.pl @@ -37,8 +37,7 @@ my $builder = sub { my $dateentered = date_entered(); my $defaultval = substr( C4::Context->preference(PREF_008) || FIXLEN_DATA_ELTS, 0, 34 ); my $res=" - "; diff --git a/cataloguing/value_builder/marc21_field_008_classifications.pl b/cataloguing/value_builder/marc21_field_008_classifications.pl index f066c7ec21..c4e50d8bf1 100755 --- a/cataloguing/value_builder/marc21_field_008_classifications.pl +++ b/cataloguing/value_builder/marc21_field_008_classifications.pl @@ -32,8 +32,7 @@ my $builder = sub { my $dateentered = date_entered(); my $defaultval = FIXLEN_DATA_ELTS; my $res=" - "; diff --git a/cataloguing/value_builder/marc21_field_245h.pl b/cataloguing/value_builder/marc21_field_245h.pl index 0680410d88..667ae2249a 100755 --- a/cataloguing/value_builder/marc21_field_245h.pl +++ b/cataloguing/value_builder/marc21_field_245h.pl @@ -27,8 +27,7 @@ my $builder = sub { my $function_name = $params->{id}; my $res = " - "; return $res; }; -return { builder => $builder }; \ No newline at end of file +return { builder => $builder }; diff --git a/cataloguing/value_builder/marc21_leader.pl b/cataloguing/value_builder/marc21_leader.pl index 755300a827..45537786b0 100755 --- a/cataloguing/value_builder/marc21_leader.pl +++ b/cataloguing/value_builder/marc21_leader.pl @@ -30,8 +30,7 @@ my $builder = sub { my ( $params ) = @_; my $function_name = $params->{id}; my $res = " - "; diff --git a/cataloguing/value_builder/marc21_leader_authorities.pl b/cataloguing/value_builder/marc21_leader_authorities.pl index 1b7aa7e1cd..d79933d234 100755 --- a/cataloguing/value_builder/marc21_leader_authorities.pl +++ b/cataloguing/value_builder/marc21_leader_authorities.pl @@ -32,8 +32,7 @@ my $builder = sub { my ( $params ) = @_; my $function_name = $params->{id}; my $res = " - "; @@ -92,4 +90,4 @@ my $launcher = sub { output_html_with_http_headers $input, $cookie, $template->output; }; -return { builder => $builder, launcher => $launcher }; \ No newline at end of file +return { builder => $builder, launcher => $launcher }; diff --git a/cataloguing/value_builder/marc21_linking_section.pl b/cataloguing/value_builder/marc21_linking_section.pl index ccadc9cac6..2800a04ad6 100755 --- a/cataloguing/value_builder/marc21_linking_section.pl +++ b/cataloguing/value_builder/marc21_linking_section.pl @@ -41,7 +41,7 @@ my $builder = sub { my ( $params ) = @_; my $function_name = $params->{id}; my $res = " - HERE }; diff --git a/cataloguing/value_builder/normarc_field_007.pl b/cataloguing/value_builder/normarc_field_007.pl index 2931b4204e..ccc7ff892d 100755 --- a/cataloguing/value_builder/normarc_field_007.pl +++ b/cataloguing/value_builder/normarc_field_007.pl @@ -29,15 +29,13 @@ sub plugin_javascript { my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; my $function_name= $field_number; my $res=" - "; diff --git a/cataloguing/value_builder/normarc_field_008.pl b/cataloguing/value_builder/normarc_field_008.pl index a156cd268e..50fdb81180 100755 --- a/cataloguing/value_builder/normarc_field_008.pl +++ b/cataloguing/value_builder/normarc_field_008.pl @@ -39,8 +39,7 @@ sub plugin_javascript { my ($dbh, $record, $tagslib, $field_number, $tabloop) = @_; my $function_name = $field_number; my $res = " - "; diff --git a/cataloguing/value_builder/normarc_leader.pl b/cataloguing/value_builder/normarc_leader.pl index 29a1a7aef2..a3381aaff6 100755 --- a/cataloguing/value_builder/normarc_leader.pl +++ b/cataloguing/value_builder/normarc_leader.pl @@ -31,8 +31,7 @@ sub plugin_javascript { my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; my $function_name= $field_number; my $res=" - "; diff --git a/cataloguing/value_builder/stocknumber.pl b/cataloguing/value_builder/stocknumber.pl index 11e237c921..03dc79de06 100755 --- a/cataloguing/value_builder/stocknumber.pl +++ b/cataloguing/value_builder/stocknumber.pl @@ -37,8 +37,7 @@ my $builder = sub { $nextnum = $branchcode.'_'.$nextnum; my $js = < -// function Focus$function_name(id, force) { if (\$('#' + id).val() == '' || force) { @@ -50,7 +49,6 @@ function Click$function_name(event) { Focus$function_name(event.data.id, 1); return false; } -//]]> END_OF_JS return $js; diff --git a/cataloguing/value_builder/stocknumberam123.pl b/cataloguing/value_builder/stocknumberam123.pl index afed9e96ee..06c6abe570 100755 --- a/cataloguing/value_builder/stocknumberam123.pl +++ b/cataloguing/value_builder/stocknumberam123.pl @@ -43,7 +43,7 @@ In this case, a stocknumber has this form : "PREFIX 0009678570". my $builder = sub { my ( $params ) = @_; my $res=" -