From c8006588c5226646e5174b29e99be81f19e2a029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Ho=CC=88=C3=9Fl?= Date: Sat, 4 Mar 2017 16:17:48 +0100 Subject: [PATCH] Handle STRIKE-tags correctly in line numbering --- openslides/motions/static/js/motions/linenumbering.js | 3 ++- tests/karma/motions/linenumbering.service.test.js | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/openslides/motions/static/js/motions/linenumbering.js b/openslides/motions/static/js/motions/linenumbering.js index 5a4833d08..09e6dba5f 100644 --- a/openslides/motions/static/js/motions/linenumbering.js +++ b/openslides/motions/static/js/motions/linenumbering.js @@ -39,7 +39,8 @@ angular.module('OpenSlidesApp.motions.lineNumbering', []) this._isInlineElement = function (node) { var inlineElements = [ - 'SPAN', 'A', 'EM', 'S', 'B', 'I', 'STRONG', 'U', 'BIG', 'SMALL', 'SUB', 'SUP', 'TT', 'INS', 'DEL' + 'SPAN', 'A', 'EM', 'S', 'B', 'I', 'STRONG', 'U', 'BIG', 'SMALL', 'SUB', 'SUP', 'TT', 'INS', 'DEL', + 'STRIKE' ]; return (inlineElements.indexOf(node.nodeName) > -1); }; diff --git a/tests/karma/motions/linenumbering.service.test.js b/tests/karma/motions/linenumbering.service.test.js index 785354ca4..7b13ab966 100644 --- a/tests/karma/motions/linenumbering.service.test.js +++ b/tests/karma/motions/linenumbering.service.test.js @@ -133,6 +133,13 @@ describe('linenumbering', function () { expect(outHtml).toBe(noMarkup(1) + '1234 1234 ' + brMarkup(2) + '1234 1234'); expect(lineNumberingService.stripLineNumbers(outHtml)).toBe(inHtml); }); + + it('handles STRIKE-tags', function () { + var inHtml = '

et accusam et justo duo dolores et ea rebum Inserted Text. Stet clita kasd gubergren,

'; + var outHtml = lineNumberingService.insertLineNumbers(inHtml, 80); + expect(outHtml).toBe('

' + noMarkup(1) + 'et accusam et justo duo dolores et ea rebum Inserted Text. Stet clita kasd ' + brMarkup(2) + 'gubergren,

'); + expect(lineNumberingService.stripLineNumbers(outHtml)).toBe(inHtml); + }); });