[PATCH] gitweb: Fix links to lines in blobs when javascript-actions are enabled
From: Peter Stuge <hidden>
Date: 2016-06-15 22:52:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] gitweb: Fix links to lines in blobs when javascript-actions are enabled · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] gitweb: Fix links to lines in blobs when javascript-actions are enabled · Peter Stuge <hidden>
Some javascript code will run in the browser onLoad and signals back to gitweb that the browser can actually do javascript. The code adds [?;]js=1 into the URL of all links on the page. The code always added [?;]js=1 to the end of links, which is wrong when links contain a URI fragment, such as links directly to a line in a blob: ..?p=repo.git;a=blob;f=file#l123 In this case, [?;]js=1 must be added before the hashmark. Signed-off-by: Peter Stuge <redacted> --- gitweb/static/js/javascript-detection.js | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gitweb/static/js/javascript-detection.js b/gitweb/static/js/javascript-detection.js
index 93dd2bd..fa2596f 100644
--- a/gitweb/static/js/javascript-detection.js
+++ b/gitweb/static/js/javascript-detection.js@@ -16,7 +16,7 @@ * and other reasons to not add 'js=1' param at the end of link * @constant */ -var jsExceptionsRe = /[;?]js=[01]$/; +var jsExceptionsRe = /[;?]js=[01](#.*)?$/; /** * Add '?js=1' or ';js=1' to the end of every link in the document
@@ -33,9 +33,9 @@ function fixLinks() { var allLinks = document.getElementsByTagName("a") || document.links; for (var i = 0, len = allLinks.length; i < len; i++) { var link = allLinks[i]; - if (!jsExceptionsRe.test(link)) { // =~ /[;?]js=[01]$/; - link.href += - (link.href.indexOf('?') === -1 ? '?' : ';') + 'js=1'; + if (!jsExceptionsRe.test(link)) { + link.href = link.href.replace(/(#|$)/, + (link.href.indexOf('?') === -1 ? '?' : ';') + 'js=1$1'); } } }
--
1.7.4.1.343.ga91df.dirty