$list.parents('tr').removeClass('end-selected-line');
$list.parents('tr').find('td').removeClass('selected-line');
if ($from) {
- var expr = new RegExp(/diff-(\d+)L(\d+)/);
+ var expr = new RegExp(/diff-(\w+)([LR])(\d+)/);
var selectMatches = $select.attr('rel').match(expr)
var fromMatches = $from.attr('rel').match(expr)
- var a = parseInt(selectMatches[2]);
- var b = parseInt(fromMatches[2]);
+ var a = parseInt(selectMatches[3]);
+ var b = parseInt(fromMatches[3]);
var linesIntToStr = {};
- linesIntToStr[a] = selectMatches[2];
- linesIntToStr[b] = fromMatches[2];
+ linesIntToStr[a] = selectMatches[3];
+ linesIntToStr[b] = fromMatches[3];
var c;
if (a != b) {
a = b;
b = c;
}
- $('[rel=diff-'+fromMatches[1]+'L' + linesIntToStr[b] + ']').parents('tr').next().addClass('end-selected-line');
- var $selectedLines = $('[rel=diff-'+fromMatches[1]+'L' + linesIntToStr[a] + ']').parents('tr').nextUntil('.end-selected-line').andSelf();
+ $('[rel=diff-'+fromMatches[1] + fromMatches[2] + linesIntToStr[b] + ']').parents('tr').next().addClass('end-selected-line');
+ var $selectedLines = $('[rel=diff-'+fromMatches[1]+selectMatches[2] + linesIntToStr[a] + ']').parents('tr').nextUntil('.end-selected-line').andSelf();
$selectedLines.find('td.lines-num > span').addClass('active')
$selectedLines.find('td').addClass('selected-line');
- $.changeHash('#diff-'+fromMatches[1]+'L' + linesIntToStr[a] + '-L' + linesIntToStr[b]);
+ $.changeHash('#diff-'+fromMatches[1]+fromMatches[2] + linesIntToStr[a] + '-' + selectMatches[2] + + linesIntToStr[b]);
return
}
}
});
$(window).on('hashchange', function (e) {
- var m = window.location.hash.match(/^#diff-(\d+)(L\d+)\-(L\d+)$/);
+ var m = window.location.hash.match(/^#diff-(\w+)([LR]\d+)\-([LR]\d+)$/);
var $list = $('.code-diff td.lines-num > span');
var $first;
if (m) {
$("html, body").scrollTop($first.offset().top - 200);
return;
}
- m = window.location.hash.match(/^#diff-(\d+)(L\d+)$/);
+ m = window.location.hash.match(/^#diff-(\w+)([LR]\d+)$/);
if (m) {
$first = $list.filter('[rel=diff-' + m[1] + m[2] + ']');
selectRange($list, $first);
<table>
<tbody>
{{range $j, $section := $file.Sections}}
- {{range $k, $line := $section.Lines}}
+ {{range $k, $line := $section.Lines}}
<tr class="{{DiffLineTypeToStr .Type}}-code nl-{{$i}} ol-{{$i}}">
<td class="lines-num lines-num-old">
- <span rel="diff-{{Add $i 1}}L{{$j}}{{$k}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span>
+ <span rel="{{if $line.LeftIdx}}diff-L{{Sha1 $file.Name}}{{$line.LeftIdx}}{{end}}">{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}</span>
</td>
<td class="lines-num lines-num-new">
- <span rel="diff-{{Add $i 1}}L{{$j}}{{$k}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span>
+ <span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span>
</td>
<td class="lines-code">