undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6

Browse Source 
* ps/gitweb-js-with-lineno:
  gitweb: Fix links to lines in blobs when javascript-actions are enabled
This commit is contained in:
Junio C Hamano 2011-10-26 16:12:35 -07:00
commit 58f75bcf32
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gitweb/static/js/javascript-detection.js
View File

@ -16,7 +16,7 @@
* and other reasons to not add 'js=1' param at the end of link * and other reasons to not add 'js=1' param at the end of link
* @constant * @constant
*/ */
var jsExceptionsRe = /[;?]js=[01]$/; var jsExceptionsRe = /[;?]js=[01](#.*)?$/;
/** /**
* Add '?js=1' or ';js=1' to the end of every link in the document * 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; var allLinks = document.getElementsByTagName("a") || document.links;
for (var i = 0, len = allLinks.length; i < len; i++) { for (var i = 0, len = allLinks.length; i < len; i++) {
var link = allLinks[i]; var link = allLinks[i];
if (!jsExceptionsRe.test(link)) { // =~ /[;?]js=[01]$/; if (!jsExceptionsRe.test(link)) {
link.href += link.href = link.href.replace(/(#|$)/,
(link.href.indexOf('?') === -1 ? '?' : ';') + 'js=1'; (link.href.indexOf('?') === -1 ? '?' : ';') + 'js=1$1');
} }
} }
} }