kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixes for match lines in parallel view.

Browse source
This commit is contained in:
Fatih Acet 2016-07-31 18:31:56 +03:00
parent 89875afff6
commit 85507b25e4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/merge_conflict_data_provider.js.es6
View file

@ -67,8 +67,10 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
}
}
else {
file.parallelLines.left.push({ lineType: 'context', lineNumber: line.old_line, richText: line.rich_text });
file.parallelLines.right.push({ lineType: 'context', lineNumber: line.new_line, richText: line.rich_text });
const lineType = line.type || 'context';
const hasMatch = line.type === 'match';
file.parallelLines.left.push({ lineType, hasMatch, lineNumber: line.old_line, richText: line.rich_text });
file.parallelLines.right.push({ lineType, hasMatch, lineNumber: line.new_line, richText: line.rich_text });
}
});
});