From d4a72f4b37b767df4e91368db9e8957a6be9ad9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Ho=CC=88=C3=9Fl?= <tobias@hoessl.eu>
Date: Fri, 24 Mar 2017 21:06:51 +0100
Subject: [PATCH] Bugfix for regression introduced by
 #c912811bd37b70b897cdb0fdc50cbe516e853cc0

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

diff --git a/openslides/motions/static/js/motions/diff.js b/openslides/motions/static/js/motions/diff.js
index 7cd5cd6a9..893332cbc 100644
--- a/openslides/motions/static/js/motions/diff.js
+++ b/openslides/motions/static/js/motions/diff.js
@@ -1078,7 +1078,7 @@ angular.module('OpenSlidesApp.motions.diff', ['OpenSlidesApp.motions.lineNumberi
             });
 
             diffUnnormalized = diffUnnormalized.replace(
-                /<del>((<BR CLASS="OS-LINE-BREAK">)?<span[^>]+OS-LINE-NUMBER.+?)<\/del>/gi,
+                /<del>((<BR CLASS="OS-LINE-BREAK">)?<span[^>]+OS-LINE-NUMBER[^>]+?>\s*<\/span>)<\/del>/gi,
                 function(found,tag) {
                     return tag.toLowerCase().replace(/> <\/span/gi, ">&nbsp;</span");
                 }
diff --git a/tests/karma/motions/diff.service.test.js b/tests/karma/motions/diff.service.test.js
index ad1052f09..4ebcc68a2 100644
--- a/tests/karma/motions/diff.service.test.js
+++ b/tests/karma/motions/diff.service.test.js
@@ -441,6 +441,20 @@ describe('linenumbering', function () {
 
       expect(diff).toBe("<p><ins>Einfügung 1 </ins>...so frißt er Euch alle mit Haut und Haar<ins> und Augen und Därme und alles</ins>.</p>\n<p>Test</p>");
     });
+
+    it('does not lose formattings when multiple lines are deleted', function () {
+      var before = '<p>' +
+              noMarkup(13) + 'diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd ' +
+              brMarkup(14) + 'gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>',
+          after= '<p>Test</p>';
+      var diff = diffService.diff(before, after).toLowerCase(),
+          expected = '<p class="delete">' +
+          noMarkup(13).replace(/&nbsp;/, "\u00A0") + 'diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd ' +
+          brMarkup(14).replace(/&nbsp;/, "\u00A0") + 'gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>' +
+          '<p class="insert">Test</p>';
+
+      expect(diff).toBe(expected.toLowerCase());
+    });
   });
 
   describe('ignoring line numbers', function () {