Merge pull request #3347 from FinnStutzenstein/Issue3343

Fixing paragraphs in lists when exporting PDF (fixes #3343)

CHANGELOG

@@ -75,7 +75,7 @@ General:
 - Switched from npm to Yarn [#3188].
 - Improved performance for PDF generation significantly (by upgrading
   to pdfmake 0.1.30) [#3278, #3285].
-- Bugfixes for PDF creation [#3227, #3251, #3279, #3286, #3346].
+- Bugfixes for PDF creation [#3227, #3251, #3279, #3286, #3346, #3347].
 - Improvements for plugin integration [#3330].
 
 

openslides/core/static/js/core/pdf.js

@@ -590,6 +590,17 @@ angular.module('OpenSlidesApp.core.pdf', [])
                                 return false;
                             }
                         },
+                        // Helper function for determinating whether a parent of element is a list item.
+                        isInsideAList = function (element) {
+                            parent = element.parentNode;
+                            while(parent !== null) {
+                                if (parent.nodeName.toLowerCase() === 'li') {
+                                    return true;
+                                }
+                                parent = parent.parentNode;
+                            }
+                            return false;
+                        },
                         /**
                          * Parses a single HTML element
                          * @function
@@ -791,9 +802,13 @@ angular.module('OpenSlidesApp.core.pdf', [])
                                 case "p":
                                     var pObjectToPush; //determine what to push later
                                     currentParagraph = create("text");
-                                    currentParagraph.margin = [20, 0, 0, 0];
+                                    // If this element is inside a list (happens if copied from word), do not set spaces
-                                    if (classes.indexOf('os-split-before') === -1) {
+                                    // and margins. Just leave the paragraph there..
-                                        currentParagraph.margin[1] = 8;
+                                    if (!isInsideAList(element)) {
+                                        currentParagraph.margin = [20, 0, 0, 0];
+                                        if (classes.indexOf('os-split-before') === -1) {
+                                            currentParagraph.margin[1] = 8;
+                                        }
                                     }
                                     currentParagraph.lineHeight = 1.25;
                                     var stackP = create("stack");