From b574502a378e03888e35832d9fae5fb6169667d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Ho=CC=88=C3=9Fl?= <tobias@hoessl.eu>
Date: Sat, 20 Jan 2018 11:48:46 +0100
Subject: [PATCH] Bugfix: Diff and Line breaks at dashes

---
 openslides/motions/static/js/motions/diff.js | 1 +
 tests/karma/motions/diff.service.test.js     | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/openslides/motions/static/js/motions/diff.js b/openslides/motions/static/js/motions/diff.js
index 51316ad41..99f34540c 100644
--- a/openslides/motions/static/js/motions/diff.js
+++ b/openslides/motions/static/js/motions/diff.js
@@ -937,6 +937,7 @@ angular.module('OpenSlidesApp.motions.diff', ['OpenSlidesApp.motions.lineNumberi
             arr = splitArrayEntriesSplitSeparator(arr, ".");
             arr = splitArrayEntriesSplitSeparator(arr, ",");
             arr = splitArrayEntriesSplitSeparator(arr, "!");
+            arr = splitArrayEntriesSplitSeparator(arr, "-");
             arr = splitArrayEntriesEmbedSeparator(arr, "\n", false);
 
             var arrWithoutEmptes = [];
diff --git a/tests/karma/motions/diff.service.test.js b/tests/karma/motions/diff.service.test.js
index fd46b39bd..919a8209a 100644
--- a/tests/karma/motions/diff.service.test.js
+++ b/tests/karma/motions/diff.service.test.js
@@ -651,6 +651,15 @@ describe('linenumbering', function () {
             "<P class=\"insert\"><SPAN>Ya</SPAN></P><INS>\n\n</INS>" +
             "<P class=\"insert\">Die Geißlein sagten: \" Liebe Mutter, wir wollen uns schon in acht nehmen, du kannst ohne</P>");
     });
+
+    it('line breaks at dashes does not delete/insert the last/first word of the split lines', function () {
+      var before = "<ul><li>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy ei rmodtem-Porinv idunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</li></ul>",
+          after = "<ul><li>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy ei rmodtem-Porinv idunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</li></ul>";
+
+      before = lineNumberingService.insertLineNumbers(before, 90);
+      var diff = diffService.diff(before, after);
+      expect(diff).toBe("<ul><li>" + noMarkup(1) + "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy ei rmodtem-" + brMarkup(2) + "Porinv idunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</li></ul>");
+    });
   });
 
   describe('addCSSClassToFirstTag function', function () {