foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-27 13:39:19 -05:00
Code Issues Wiki Activity

js fix R1-L1 highlight

Browse source
This commit is contained in:
Alexey Makhov 2015-02-19 11:08:47 +03:00
parent d2f439a241
commit 3efe3f42e8
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
public/ng/js/gogs.js
View file

@ -209,27 +209,28 @@ var Gogs = {};
$list.parents('tr').removeClass('end-selected-line'); $list.parents('tr').removeClass('end-selected-line');
$list.parents('tr').find('td').removeClass('selected-line'); $list.parents('tr').find('td').removeClass('selected-line');
if ($from) { if ($from) {
var expr = new RegExp(/diff-(\w+)([LR])(\d+)/); var expr = new RegExp(/diff-(\w+)([LR]\d+)/);
var selectMatches = $select.attr('rel').match(expr) var selectMatches = $select.attr('rel').match(expr)
var fromMatches = $from.attr('rel').match(expr) var fromMatches = $from.attr('rel').match(expr)
var a = parseInt(selectMatches[3]); var selectTop = $select.offset().top;
var b = parseInt(fromMatches[3]); var fromTop = $from.offset().top;
var linesIntToStr = {}; var hash;
linesIntToStr[a] = selectMatches[3];
linesIntToStr[b] = fromMatches[3];
var c; if (selectMatches[2] != fromMatches[2]) {
if (a != b) { if ((selectTop > fromTop)) {
if (a > b) { $startElem = $from;
c = a; $endElem = $select;
a = b; hash = fromMatches[1]+fromMatches[2] + '-' + selectMatches[2];
b = c; } else {
$startElem = $select;
$endElem = $from;
hash = selectMatches[1]+selectMatches[2] + '-' + fromMatches[2];
} }
$('[rel=diff-'+fromMatches[1] + fromMatches[2] + linesIntToStr[b] + ']').parents('tr').next().addClass('end-selected-line'); $endElem.parents('tr').next().addClass('end-selected-line');
var $selectedLines = $('[rel=diff-'+fromMatches[1]+selectMatches[2] + linesIntToStr[a] + ']').parents('tr').nextUntil('.end-selected-line').andSelf(); var $selectedLines = $startElem.parents('tr').nextUntil('.end-selected-line').andSelf();
$selectedLines.find('td.lines-num > span').addClass('active') $selectedLines.find('td.lines-num > span').addClass('active')
$selectedLines.find('td').addClass('selected-line'); $selectedLines.find('td').addClass('selected-line');
$.changeHash('#diff-'+fromMatches[1]+fromMatches[2] + linesIntToStr[a] + '-' + selectMatches[2] + + linesIntToStr[b]); $.changeHash('#diff-'+hash);
return return
} }
} }