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

Merge pull request #3279 from FinnStutzenstein/Issue3273

Browse Source 
Fixing linenumbers on page break (fixes #3273)
This commit is contained in:
Emanuel Schütze 2017-06-01 15:31:36 +02:00 committed by GitHub
commit 074559ba23
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -54,9 +54,9 @@ Mediafiles:
General: General:
- Switched from npm to Yarn [#3188]. - Switched from npm to Yarn [#3188].
- Several bugfixes and minor improvements. - Several bugfixes and minor improvements.
- Bugfixes for PDF creation [#3227, #3251]
- Improved performance for pdf generation significantly (by upgrading - Improved performance for pdf generation significantly (by upgrading
to pdfmake 0.1.29) [#3278]. to pdfmake 0.1.29) [#3278].
- Bugfixes for PDF creation [#3227, #3251, #3279]
Version 2.1.1 (2017-04-05) Version 2.1.1 (2017-04-05)

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

@ -731,16 +731,27 @@ angular.module('OpenSlidesApp.core.pdf', [])
lineNumberOutline = element.getAttribute("data-line-number"); lineNumberOutline = element.getAttribute("data-line-number");
} }
var lineNumberObject = { var lineNumberObject = {
width: 20, width: 20,
text: lineNumberOutline, text: [
color: "gray", {
fontSize: 8, text: ' ', // Add a blank with the normal font size here, so in rare cases the text
margin: [0, 2, 0, 0] // is rendered on the next page and the linenumber on the previous page.
}, fontSize: 10,
col = { decoration: '',
columns: [ },
lineNumberObject, {
] text: lineNumberOutline,
color: "gray",
fontSize: 8,
decoration: '',
},
],
margin: [0, 2, 0, 0]
};
var col = {
columns: [
lineNumberObject,
]
}; };
currentParagraph = create("text"); currentParagraph = create("text");
currentParagraph.lineHeight = 1.25; currentParagraph.lineHeight = 1.25;