ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3268 from emanuelschuetze/pdf-issue

Browse Source 
Fixed formatting errors in motion pdf (Fixed #3228).
This commit is contained in:
Emanuel Schütze 2017-05-23 22:52:31 +02:00 committed by GitHub
commit 1b6dd93e6e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openslides/core/static/js/core/pdf.js
View File

@ -766,7 +766,9 @@ angular.module('OpenSlidesApp.core.pdf', [])
break; break;
} else { } else {
currentParagraph = create("text"); currentParagraph = create("text");
if (lineNumberMode == "outside" && brParentNodeName == ("INS" || "DEL")) { if (lineNumberMode == "outside" &&
brParentNodeName != "LI"&&
element.parentNode.parentNode.nodeName != "LI") {
currentParagraph.margin = [20, 0, 0, 0]; currentParagraph.margin = [20, 0, 0, 0];
} }
currentParagraph.lineHeight = 1.25; currentParagraph.lineHeight = 1.25;
@ -860,6 +862,7 @@ angular.module('OpenSlidesApp.core.pdf', [])
case "ul": case "ul":
case "ol": case "ol":
var list = create(nodeName); var list = create(nodeName);
ComputeStyle(list, styles);
if (lineNumberMode == "outside") { if (lineNumberMode == "outside") {
var lines = extractLineNumbers(element); var lines = extractLineNumbers(element);
currentParagraph = parseChildren(list[nodeName], element, currentParagraph, styles, diff_mode); currentParagraph = parseChildren(list[nodeName], element, currentParagraph, styles, diff_mode);
@ -884,6 +887,7 @@ angular.module('OpenSlidesApp.core.pdf', [])
listCol.margin = [0,10,0,0]; listCol.margin = [0,10,0,0];
alreadyConverted.push(listCol); alreadyConverted.push(listCol);
} else { } else {
list.margin = [20, 0, 0, 0];
alreadyConverted.push(list); alreadyConverted.push(list);
} }
} else { } else {