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

use ParseInt in PDF generation

Browse Source 
Replace "+"(string) with parseInt(val, 10), since apparently some editors
copy `style="xy.zpt"` into a style tag
This commit is contained in:
Sean Engelhardt 2019-04-29 12:43:22 +02:00
parent 29aa6acdc5
commit 945b2ce72a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/app/core/ui-services/html-to-pdf.service.ts
View File

@ -328,7 +328,7 @@ export class HtmlToPdfService {
if (nodeName === 'ol') { if (nodeName === 'ol') {
const start = element.getAttribute('start'); const start = element.getAttribute('start');
if (start) { if (start) {
list.start = +start; list.start = parseInt(start, 10);
} }
} }
@ -579,7 +579,7 @@ export class HtmlToPdfService {
element.getAttribute('class') && element.getAttribute('class') &&
element.getAttribute('class').indexOf('os-line-number') > -1 element.getAttribute('class').indexOf('os-line-number') > -1
) { ) {
return +element.getAttribute('data-line-number'); return parseInt(element.getAttribute('data-line-number'), 10);
} }
} }
@ -603,11 +603,11 @@ export class HtmlToPdfService {
if (styleDefinition.length === 2) { if (styleDefinition.length === 2) {
switch (key) { switch (key) {
case 'padding-left': { case 'padding-left': {
styleObject.margin = [+value, 0, 0, 0]; styleObject.margin = [parseInt(value, 10), 0, 0, 0];
break; break;
} }
case 'font-size': { case 'font-size': {
styleObject.fontSize = +value; styleObject.fontSize = parseInt(value, 10);
break; break;
} }
case 'text-align': { case 'text-align': {
@ -688,7 +688,7 @@ export class HtmlToPdfService {
} else if (rgbRegex.test(color)) { } else if (rgbRegex.test(color)) {
const decimalColors = rgbRegex.exec(color).slice(1); const decimalColors = rgbRegex.exec(color).slice(1);
for (let i = 0; i < 3; i++) { for (let i = 0; i < 3; i++) {
let decimalValue = +decimalColors[i]; let decimalValue = parseInt(decimalColors[i], 10);
if (decimalValue > 255) { if (decimalValue > 255) {
decimalValue = 255; decimalValue = 255;
} }