summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2019-07-27 08:12:59 +1000
committerSimon Knox <psimyn@gmail.com>2019-07-27 08:12:59 +1000
commite675f9561cf5e7a51c80bab548c738ca77b0d8bc (patch)
tree1b81a657a83ba0e93dedf2d4db4382a29babe018
parentca98c2852010c9436c7fb30f4243542277a813dc (diff)
downloadgitlab-ce-psimyn-diff-lines-frontend.tar.gz
Readd missing line_code to parallel linespsimyn-diff-lines-frontend
-rw-r--r--app/assets/javascripts/diffs/store/utils.js12
1 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js
index c7d77ba54ea..000537c86a7 100644
--- a/app/assets/javascripts/diffs/store/utils.js
+++ b/app/assets/javascripts/diffs/store/utils.js
@@ -197,12 +197,22 @@ export function trimFirstCharOfLineContent(line = {}) {
return parsedLine;
}
+function getLineCode({ left, right }, index) {
+ if (left && left.line_code) {
+ return left.line_code;
+ } else if (right && right.line_code) {
+ return right.line_code;
+ }
+ return index;
+}
+
export function parallelizeDiffLines(highlightedDiffLines = []) {
let i = 0;
const lines = [];
let freeRightIndex = null;
- highlightedDiffLines.forEach(line => {
+ highlightedDiffLines.forEach((line, index) => {
+ line.line_code = getLineCode(line, index);
if (line.removed) {
lines.push({
left: line,