From 5d9128403ab51613f76e99e8876821aa8bc8aad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Ho=CC=88=C3=9Fl?= <tobias@hoessl.eu>
Date: Sun, 17 Mar 2019 20:31:25 +0100
Subject: [PATCH] Bugfix: Diff

---
 .../motions/motion/motion-slide.component.ts      | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/client/src/app/slides/motions/motion/motion-slide.component.ts b/client/src/app/slides/motions/motion/motion-slide.component.ts
index 79866365d..f1abc73f4 100644
--- a/client/src/app/slides/motions/motion/motion-slide.component.ts
+++ b/client/src/app/slides/motions/motion/motion-slide.component.ts
@@ -110,7 +110,6 @@ export class MotionSlideComponent extends BaseMotionSlideComponent<MotionSlideDa
                     }
 
                     const origText = baseParagraphs[paraNo],
-                        paragraphLines = this.lineNumbering.getLineNumberRange(origText),
                         diff = this.diff.diff(origText, newText),
                         affectedLines = this.diff.detectAffectedLineRange(diff);
 
@@ -118,18 +117,12 @@ export class MotionSlideComponent extends BaseMotionSlideComponent<MotionSlideDa
                         return null;
                     }
 
-                    let newTextLines = this.lineNumbering.insertLineNumbers(
-                        newText,
-                        this.lineLength,
-                        null,
-                        null,
-                        paragraphLines.from
-                    );
-                    newTextLines = this.diff.formatDiff(
-                        this.diff.extractRangeByLineNumbers(newTextLines, affectedLines.from, affectedLines.to)
+                    const affectedDiff = this.diff.formatDiff(
+                        this.diff.extractRangeByLineNumbers(diff, affectedLines.from, affectedLines.to)
                     );
+                    const affectedConsolidated = this.diff.diffHtmlToFinalText(affectedDiff);
 
-                    return new MotionSlideObjAmendmentParagraph(amendment, paraNo, newTextLines, affectedLines);
+                    return new MotionSlideObjAmendmentParagraph(amendment, paraNo, affectedConsolidated, affectedLines);
                 }
             )
             .filter((para: MotionSlideObjAmendmentParagraph) => para !== null);