From c36a795cb6b387c7bb8ddf103b71d937480c4d21 Mon Sep 17 00:00:00 2001
From: Chris Morgan <me@chrismorgan.info>
Date: Sat, 8 Jan 2022 16:34:46 +1100
Subject: [PATCH] Make JavaScript *actually* optional
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

That is, don’t emit it if it isn’t going to be used.
---
 gitweb.cgi | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/gitweb.cgi b/gitweb.cgi
index 8ece13d..515d80c 100755
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -4310,10 +4310,10 @@ sub git_footer_html {
 		insert_file($site_footer);
 	}
 
-	print qq!<script type="text/javascript" src="!.esc_url($javascript).qq!"></script>\n!;
 	if (defined $action &&
 	    $action eq 'blame_incremental') {
-		print qq!<script type="text/javascript">\n!.
+		print qq!<script src="!.esc_url($javascript).qq!"></script>\n!;
+		print qq!<script>\n!.
 		      qq!startBlame("!. esc_attr(href(action=>"blame_data", -replay=>1)) .qq!",\n!.
 		      qq!           "!. esc_attr(href()) .qq!");\n!.
 		      qq!</script>\n!;
@@ -4321,17 +4321,20 @@ sub git_footer_html {
 		my ($jstimezone, $tz_cookie, $datetime_class) =
 			gitweb_get_feature('javascript-timezone');
 
-		print qq!<script type="text/javascript">\n!.
-		      qq!window.onload = function () {\n!;
-		if (gitweb_check_feature('javascript-actions')) {
-			print qq!	fixLinks();\n!;
-		}
-		if ($jstimezone && $tz_cookie && $datetime_class) {
-			print qq!	var tz_cookie = { name: '$tz_cookie', expires: 14, path: '/' };\n!. # in days
-			      qq!	onloadTZSetup('$jstimezone', tz_cookie, '$datetime_class');\n!;
+		if (gitweb_check_feature('javascript-actions') || ($jstimezone && $tz_cookie && $datetime_class)) {
+			print qq!<script src="!.esc_url($javascript).qq!"></script>\n!;
+			print qq!<script>\n!.
+				qq!window.onload = function () {\n!;
+			if (gitweb_check_feature('javascript-actions')) {
+				print qq!	fixLinks();\n!;
+			}
+			if ($jstimezone && $tz_cookie && $datetime_class) {
+				print qq!	var tz_cookie = { name: '$tz_cookie', expires: 14, path: '/' };\n!. # in days
+					qq!	onloadTZSetup('$jstimezone', tz_cookie, '$datetime_class');\n!;
+			}
+			print qq!};\n!.
+				qq!</script>\n!;
 		}
-		print qq!};\n!.
-		      qq!</script>\n!;
 	}
 
 	print "</body>\n" .
-- 
2.42.0