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

Merge pull request #3463 from FinnStutzenstein/PdfListstyle

Browse Source 
Implement list styles in pdf (fixes #3338)
This commit is contained in:
Norman Jäckel 2017-10-29 17:52:59 +01:00 committed by GitHub
commit 50bed94249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -36,7 +36,7 @@
"ngstorage": "~0.3.11", "ngstorage": "~0.3.11",
"ngBootbox": "~0.1.3", "ngBootbox": "~0.1.3",
"papaparse": "~4.1.2", "papaparse": "~4.1.2",
"pdfmake": "0.1.30", "pdfmake": "0.1.33",
"roboto-fontface": "~0.6.0" "roboto-fontface": "~0.6.0"
}, },
"overrides": { "overrides": {

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

@ -819,6 +819,9 @@ angular.module('OpenSlidesApp.core.pdf', [])
currentParagraph = create("text"); currentParagraph = create("text");
currentParagraph.lineHeight = 1.25; currentParagraph.lineHeight = 1.25;
var stackDiv = create("stack"); var stackDiv = create("stack");
if (_.indexOf(classes, 'os-split-before') > -1) {
stackDiv.listType = 'none';
}
stackDiv.stack.push(currentParagraph); stackDiv.stack.push(currentParagraph);
ComputeStyle(stackDiv, styles); ComputeStyle(stackDiv, styles);
currentParagraph = parseChildren(stackDiv.stack, element, currentParagraph, [], diff_mode); currentParagraph = parseChildren(stackDiv.stack, element, currentParagraph, [], diff_mode);