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

Merge pull request #3346 from FinnStutzenstein/Issue3232

Browse Source 
removing obsolete merge-before
This commit is contained in:
Emanuel Schütze 2017-08-14 10:00:57 +02:00 committed by GitHub
commit 298d41def7
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -75,7 +75,7 @@ General:
- Switched from npm to Yarn [#3188]. - Switched from npm to Yarn [#3188].
- Improved performance for PDF generation significantly (by upgrading - Improved performance for PDF generation significantly (by upgrading
to pdfmake 0.1.30) [#3278, #3285]. to pdfmake 0.1.30) [#3278, #3285].
- Bugfixes for PDF creation [#3227, #3251, #3279, #3286]. - Bugfixes for PDF creation [#3227, #3251, #3279, #3286, #3346].
Version 2.1.1 (2017-04-05) Version 2.1.1 (2017-04-05)

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

@ -580,6 +580,16 @@ angular.module('OpenSlidesApp.core.pdf', [])
} }
}); });
}, },
// A little helper function to check, if an element has the given class.
hasClass = function (element, className) {
var classes = element.getAttribute('class');
if (classes) {
classes = classes.toLowerCase().split(' ');
return _.indexOf(classes, className) > -1;
} else {
return false;
}
},
/** /**
* Parses a single HTML element * Parses a single HTML element
* @function * @function
@ -751,11 +761,11 @@ angular.module('OpenSlidesApp.core.pdf', [])
var brParent = element.parentNode; var brParent = element.parentNode;
var brParentNodeName = brParent.nodeName; var brParentNodeName = brParent.nodeName;
//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" && if ((lineNumberMode == 'inline' &&
element.getAttribute("class") == "os-line-break") || hasClass(element, 'os-line-break')) ||
(lineNumberMode == "outside" && (lineNumberMode == 'outside' &&
element.getAttribute("class") == "os-line-break" && hasClass(element, 'os-line-break') &&
brParent.getAttribute("class") == "merge-before")) { hasClass(brParent, 'os-split-before'))) {
break; break;
} else { } else {
currentParagraph = create("text"); currentParagraph = create("text");
@ -782,7 +792,7 @@ angular.module('OpenSlidesApp.core.pdf', [])
var pObjectToPush; //determine what to push later var pObjectToPush; //determine what to push later
currentParagraph = create("text"); currentParagraph = create("text");
currentParagraph.margin = [20, 0, 0, 0]; currentParagraph.margin = [20, 0, 0, 0];
if (classes.indexOf("merge-before") === -1) { if (classes.indexOf('os-split-before') === -1) {
currentParagraph.margin[1] = 8; currentParagraph.margin[1] = 8;
} }
currentParagraph.lineHeight = 1.25; currentParagraph.lineHeight = 1.25;
@ -868,7 +878,9 @@ angular.module('OpenSlidesApp.core.pdf', [])
listCol.columns[0].stack.push(getLineNumberObject(line)); listCol.columns[0].stack.push(getLineNumberObject(line));
}); });
listCol.columns.push(list); listCol.columns.push(list);
listCol.margin = [0,10,0,0]; if (!hasClass(element, 'os-split-before')) {
listCol.margin = [0, 10, 0, 0];
}
alreadyConverted.push(listCol); alreadyConverted.push(listCol);
} else { } else {
list.margin = [20, 0, 0, 0]; list.margin = [20, 0, 0, 0];