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

Refactor data parser to remove duplicated objects.

Browse source
This commit is contained in:
Fatih Acet 2016-07-31 18:46:33 +03:00
parent 85507b25e4
commit b0b5e9f161
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,21 +56,19 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
lines.forEach( (line) => {
const { type } = line;
if (conflict) {
if (type === 'old') {
line = { lineType: 'conflict', hasConflict: true, lineNumber: line.old_line, richText: line.rich_text, section: 'head', id, isSelected: false, isUnselected: false, isOrigin: true }
file.parallelLines.left.push(line);
file.parallelLines.left.push(this.getLineForParallelView(line, id, 'conflict'));
}
else if (type === 'new') {
line = { lineType: 'conflict', hasConflict: true, lineNumber: line.new_line, richText: line.rich_text, section: 'origin', id, isSelected: false, isUnselected: false, isHead: true }
file.parallelLines.right.push(line);
file.parallelLines.right.push(this.getLineForParallelView(line, id, 'conflict', true));
}
}
else {
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 });
const lineType = type || 'context';
file.parallelLines.left.push (this.getLineForParallelView(line, id, lineType));
file.parallelLines.right.push(this.getLineForParallelView(line, id, lineType));
}
});
});
@ -202,6 +200,25 @@ window.MergeConflictDataProvider = class MergeConflictDataProvider {
line.isUnselected = false;
}
getLineForParallelView(line, id, lineType, isHead) {
const { old_line, new_line, rich_text } = line;
const hasConflict = lineType === 'conflict';
return {
id,
lineType,
hasConflict,
isHead: hasConflict && isHead,
isOrigin: hasConflict && !isHead,
hasMatch: lineType === 'match',
lineNumber: isHead ? new_line : old_line,
section: isHead ? 'head' : 'origin',
richText: rich_text,
isSelected: false,
isUnselected: false
}
}
getHeadHeaderLine(id) {
return {