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

Merge pull request #3211 from tsiegleauq/issue3205-pdf-align-del

Browse Source 
add more distance in PDF for DEL-tags in new lines (fixes #3205)
This commit is contained in:
Emanuel Schütze 2017-04-24 09:54:41 +02:00 committed by GitHub
commit 31c6b239c1
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -19,6 +19,7 @@ Motions:
added local transformation [#3181] added local transformation [#3181]
- Added support for export motions in a zip archive [#3189]. - Added support for export motions in a zip archive [#3189].
- Bugfix: changing motion line length did not invalidate cache [#3202] - Bugfix: changing motion line length did not invalidate cache [#3202]
- Bugfix: Added more distance in motion PDF for DEL-tags in new lines [#3211].
Core: Core:
- No reload on logoff. OpenSlides is now a full single page - No reload on logoff. OpenSlides is now a full single page

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

@ -681,13 +681,19 @@ angular.module('OpenSlidesApp.core.pdf', [])
break; break;
case "br": case "br":
//in case of inline-line-numbers and the os-line-break class ignore the break //in case of inline-line-numbers and the os-line-break class ignore the break
if ((lineNumberMode == "inline" && element.getAttribute("class") == "os-line-break") || if ((lineNumberMode == "inline" &&
(lineNumberMode == "outside" && element.getAttribute("class") == "os-line-break" && element.parentNode.tagName == "INS") || element.getAttribute("class") == "os-line-break") ||
(lineNumberMode == "outside" && element.getAttribute("class") == "os-line-break" && element.parentNode.getAttribute("class") == "merge-before")) { (lineNumberMode == "outside" &&
element.getAttribute("class") == "os-line-break" &&
element.parentNode.getAttribute("class") == "insert") ||
(lineNumberMode == "outside" &&
element.getAttribute("class") == "os-line-break" &&
element.parentNode.getAttribute("class") == "merge-before")) {
break; break;
} else { } else {
currentParagraph = create("text"); currentParagraph = create("text");
currentParagraph.lineHeight = 1.25; currentParagraph.lineHeight = 1.25;
currentParagraph.margin = [20, 0, 0, 0];
alreadyConverted.push(currentParagraph); alreadyConverted.push(currentParagraph);
} }
break; break;
@ -719,7 +725,8 @@ angular.module('OpenSlidesApp.core.pdf', [])
if (element.childNodes.length > 0) { //if we hit = 0, the code would fail if (element.childNodes.length > 0) { //if we hit = 0, the code would fail
// add empty line number column for inline diff or pragraph diff mode // add empty line number column for inline diff or pragraph diff mode
if (element.childNodes[0].tagName === "INS" || if (element.childNodes[0].tagName === "INS" ||
element.getAttribute("class") === "insert") { element.getAttribute("class") === "insert" ||
element.childNodes[0].tagName === "DEL") {
var pLineNumberPlaceholder = { var pLineNumberPlaceholder = {
width: 20, width: 20,
text: "", text: "",