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

Merge pull request #3085 from tsiegleauq/issue3025-duplicated-header

Browse Source 
fix double PDF Head in Motions (fixes #3025)
This commit is contained in:
Norman Jäckel 2017-03-21 17:19:36 +01:00 committed by GitHub
commit bd8c7f61a0
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,14 +531,36 @@ angular.module('OpenSlidesApp.core.pdf', [])
case "h4":
case "h5":
case "h6":
currentParagraph = create("text");
currentParagraph.marginBottom = 4;
currentParagraph.marginTop = 10;
/* falls through */
case "a":
currentParagraph = parseChildren(alreadyConverted, element, currentParagraph, styles.concat(elementStyles[nodeName]), diff_mode);
alreadyConverted.push(currentParagraph);
// Special case quick fix to handle the dirty HTML format*/
// see following issue: https://github.com/OpenSlides/OpenSlides/issues/3025
if (lineNumberMode === "outside") {
var HeaderOutsideLineNumber = {
width: 20,
text: element.childNodes[0].getAttribute("data-line-number"),
color: "gray",
fontSize: 8,
margin: [0, 2, 0, 0]
};
var HeaderOutsideLineNumberText = {
text: element.childNodes[1].textContent,
};
ComputeStyle(HeaderOutsideLineNumberText, elementStyles[nodeName]);
var HeaderOutsideLineNumberColumns = {
columns: [
HeaderOutsideLineNumber,
HeaderOutsideLineNumberText
]
};
alreadyConverted.push(HeaderOutsideLineNumberColumns);
} else {
currentParagraph = create("text");
currentParagraph.marginBottom = 4;
currentParagraph.marginTop = 10;
currentParagraph = parseChildren(alreadyConverted, element, currentParagraph, styles.concat(elementStyles[nodeName]), diff_mode);
alreadyConverted.push(currentParagraph);
}
break;
case "a":
case "b":
case "strong":
case "u":