diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:12:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-26 16:12:35 -0700 |
| commit | 58f75bcf323e86067147ac66bbb493e6a8c2631f (patch) | |
| tree | 02c2830b9ef3fbc7ac83b0f6f76d39ab81f4245b | |
| parent | Merge branch 'jm/mergetool-pathspec' into maint-1.7.6 (diff) | |
| parent | gitweb: Fix links to lines in blobs when javascript-actions are enabled (diff) | |
| download | tgif-58f75bcf323e86067147ac66bbb493e6a8c2631f.tar.xz | |
Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6
* ps/gitweb-js-with-lineno:
gitweb: Fix links to lines in blobs when javascript-actions are enabled
| -rw-r--r-- | 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 93dd2bdd91..fa2596f77c 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'); } } } |