Peter Stuge <peter@xxxxxxxx> writes:
It really needs a proper commit message. Perhaps something like this:
The fixLinks() function in javascript-detection.js is supposed to
add 'js' query parameter with a value of 1 to each link that does
not have 'js' query parameter already.
However it didn't take into account the fact that URI can have
'fragment' part. It meant that:
1. URIs with fragment and 'js' query parameter, like e.g.
...foo?js=0#l199
were not recognized as having 'js' query parameter already.
2. The 'js' query parameter, in the form of either '?js=1' or ';js=1'
was appended at the end of URI, even if it included a fragment
(had a hash part). This lead to the incorrect links like this
...foo#l199?js=1
instead of adding query parameter as last part of query, but
before the fragment part, i.e.
...foo?js=1#l199
> Signed-off-by: Peter Stuge <peter@xxxxxxxx>
For what it is worth it
Acked-by: Jakub Narebski <jnareb@xxxxxxxxx>
> ---
> 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..003acd1 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)) { // =~ /[;?]js=[01](#.*)?$/;
> + link.href = link.href.replace(/(#|$)/,
> + (link.href.indexOf('?') === -1 ? '?' : ';') + 'js=1$1');
> }
> }
> }
> --
> 1.7.4.1.343.ga91df.dirty
>
--
Jakub Narębski mailto:jnareb@xxxxxxxxxx
ZTHiL IFT UW http://info.fuw.edu.pl/~jnareb/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html