are allowed. CSS-attributes like 'display: block' are ignored.
@@ -37,11 +38,15 @@ angular.module('OpenSlidesApp.motions.lineNumbering', [])
this._isInlineElement = function (node) {
var inlineElements = [
- 'SPAN', 'A', 'EM', 'S', 'B', 'I', 'STRONG', 'U', 'BIG', 'SMALL', 'SUB', 'SUP', 'TT'
+ 'SPAN', 'A', 'EM', 'S', 'B', 'I', 'STRONG', 'U', 'BIG', 'SMALL', 'SUB', 'SUP', 'TT', 'INS', 'DEL'
];
return (inlineElements.indexOf(node.nodeName) > -1);
};
+ this._isIgnoredByLineNumbering = function (node) {
+ return (node.nodeName == 'INS');
+ };
+
this._isOsLineBreakNode = function (node) {
var isLineBreak = false;
if (node && node.nodeType === ELEMENT_NODE && node.nodeName == 'BR' && node.hasAttribute('class')) {
@@ -304,7 +309,7 @@ angular.module('OpenSlidesApp.motions.lineNumbering', [])
} else if (oldChildren[i].nodeType == ELEMENT_NODE) {
var firstword = this._lengthOfFirstInlineWord(oldChildren[i]),
overlength = ((this._currentInlineOffset + firstword) > length && this._currentInlineOffset > 0);
- if (overlength && this._isInlineElement(oldChildren[i])) {
+ if (overlength && this._isInlineElement(oldChildren[i]) && !this._isIgnoredByLineNumbering(oldChildren[i])) {
this._currentInlineOffset = 0;
node.appendChild(this._createLineBreak());
node.appendChild(this._createLineNumber());
@@ -327,7 +332,9 @@ angular.module('OpenSlidesApp.motions.lineNumbering', [])
if (node.nodeType !== ELEMENT_NODE) {
throw 'This method may only be called for ELEMENT-nodes: ' + node.nodeValue;
}
- if (this._isInlineElement(node)) {
+ if (this._isIgnoredByLineNumbering(node)) {
+ return node;
+ } else if (this._isInlineElement(node)) {
return this._insertLineNumbersToInlineNode(node, length, highlight);
} else {
var newLength = this._calcBlockNodeLength(node, length);
@@ -357,6 +364,13 @@ angular.module('OpenSlidesApp.motions.lineNumbering', [])
return root.innerHTML;
};
+ /**
+ *
+ * @param {string} html
+ * @param {number} lineLength
+ * @param {number} highlight - optional
+ * @param {number} firstLine
+ */
this.insertLineNumbersNode = function (html, lineLength, highlight, firstLine) {
var root = document.createElement('div');
root.innerHTML = html;
diff --git a/openslides/motions/static/templates/motions/motion-detail/view-diff.html b/openslides/motions/static/templates/motions/motion-detail/view-diff.html
index 1d41f971c..29efbc21f 100644
--- a/openslides/motions/static/templates/motions/motion-detail/view-diff.html
+++ b/openslides/motions/static/templates/motions/motion-detail/view-diff.html
@@ -41,7 +41,7 @@
+ ng-bind-html="change.getDiff(motion, version, highlight) | trusted">
diff --git a/tests/karma/motions/diff.service.test.js b/tests/karma/motions/diff.service.test.js
index a11579a99..1d7f6c853 100644
--- a/tests/karma/motions/diff.service.test.js
+++ b/tests/karma/motions/diff.service.test.js
@@ -303,4 +303,53 @@ describe('linenumbering', function () {
expect(calculatedType).toBe(diffService.TYPE_REPLACEMENT);
});
});
+
+ describe('the core diff algorithm', function() {
+ it('acts as documented by the official documentation', function () {
+ var before = "The red brown fox jumped over the rolling log.",
+ after = "The brown spotted fox leaped over the rolling log.";
+ var diff = diffService.diff(before, after);
+ expect(diff).toBe('The red brown spotted fox jumleaped over the rolling log.');
+ });
+
+ it('ignores changing cases in HTML tags', function () {
+ var before = "The brown spotted fox jumped over the rolling log.",
+ after = "The brown spotted fox leaped over the rolling log.";
+ var diff = diffService.diff(before, after);
+
+ expect(diff).toBe('The brown spotted fox jumleaped over the rolling log.');
+ });
+
+ it('merges multiple inserts and deletes', function () {
+ var before = "Test1 Test2 Test3 Test4 Test5 Test9",
+ after = "Test1 Test6 Test7 Test8 Test9";
+ var diff = diffService.diff(before, after);
+
+ expect(diff).toBe('Test1 Test2 Test3 Test4 Test5 Test6 Test7 Test8 Test9');
+ });
+
+ it('detects insertions and deletions in a word (1)', function () {
+ var before = "Test1 Test2 Test3 Test4 Test5 Test6 Test7",
+ after = "Test1 Test Test3 Test4addon Test5 Test6 Test7";
+ var diff = diffService.diff(before, after);
+
+ expect(diff).toBe('Test1 Test2 Test3 Test4addon Test5 Test6 Test7');
+ });
+
+ it('detects insertions and deletions in a word (2)', function () {
+ var before = "Test Test",
+ after = "Test Testappend";
+ var diff = diffService.diff(before, after);
+
+ expect(diff).toBe('Test Testappend');
+ });
+
+ it('cannot handle changing CSS-classes', function () {
+ var before = "Test1 Test2
",
+ after = "Test1 Test2
";
+ var diff = diffService.diff(before, after);
+
+ expect(diff).toBe("Test1 Test2
Test1 Test2
");
+ });
+ });
});
diff --git a/tests/karma/motions/linenumbering.service.test.js b/tests/karma/motions/linenumbering.service.test.js
index 0f627ef99..bfa747577 100644
--- a/tests/karma/motions/linenumbering.service.test.js
+++ b/tests/karma/motions/linenumbering.service.test.js
@@ -126,6 +126,13 @@ describe('linenumbering', function () {
expect(outHtml).toBe(noMarkup(1) + 'Lorem ' + brMarkup(2) + 'ipsum ' + brMarkup(3) + 'dolor' + brMarkup(4) + 'sit ' + brMarkup(5) + 'amet');
expect(lineNumberingService.stripLineNumbers(outHtml)).toBe(inHtml);
});
+
+ it('counts within DEL nodes', function () {
+ var inHtml = "1234 1234 1234 1234";
+ var outHtml = lineNumberingService.insertLineNumbers(inHtml, 10);
+ expect(outHtml).toBe(noMarkup(1) + '1234 1234 ' + brMarkup(2) + '1234 1234');
+ expect(lineNumberingService.stripLineNumbers(outHtml)).toBe(inHtml);
+ });
});
@@ -228,4 +235,20 @@ describe('linenumbering', function () {
expect(lineNumberingService.stripLineNumbers(outHtml)).toBe(inHtml);
});
});
+
+ describe('line numbering in regard to the inline diff', function() {
+ it('does not count within INS nodes', function () {
+ var inHtml = "1234 1234 1234 1234";
+ var outHtml = lineNumberingService.insertLineNumbers(inHtml, 10);
+ expect(outHtml).toBe(noMarkup(1) + '1234 1234 1234 ' + brMarkup(2) + '1234');
+ expect(lineNumberingService.stripLineNumbers(outHtml)).toBe(inHtml);
+ });
+
+ it('does not create a new line for a trailing INS', function () {
+ var inHtml = "et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, conseteturdsfsdf23
";
+ var outHtml = lineNumberingService.insertLineNumbers(inHtml, 80);
+ expect(outHtml).toBe('' + noMarkup(1) + 'et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata ' + brMarkup(2) + 'sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, conseteturdsfsdf23
');
+ expect(lineNumberingService.stripLineNumbers(outHtml)).toBe(inHtml);
+ });
+ });
});