From a23e263dcb42474a161efde11ffc537ec9b76104 Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Wed, 17 May 2017 09:13:10 +0200 Subject: [PATCH] extending the color parser (fixes #3243) --- openslides/core/static/js/core/pdf.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openslides/core/static/js/core/pdf.js b/openslides/core/static/js/core/pdf.js index 9c4b693c0..07ff00fb2 100644 --- a/openslides/core/static/js/core/pdf.js +++ b/openslides/core/static/js/core/pdf.js @@ -487,10 +487,12 @@ angular.module('OpenSlidesApp.core.pdf', []) // e.g. #fff or #ff0048 var rgbRegex = new RegExp('^rgb\\((\\d+),\\s*(\\d+),\\s*(\\d+)\\)$'); // e.g. rgb(0,255,34) or rgb(22, 0, 0) + var nameRegex = new RegExp('^[a-z]+$'); + // matches just text like 'red', 'black', 'green' if (hexRegex.test(color)) { return color; - } else if(rgbRegex.test(color)) { + } else if (rgbRegex.test(color)) { var decimalColors = rgbRegex.exec(color).slice(1); for (var i = 0; i < 3; i++) { var decimalValue = parseInt(decimalColors[i]); @@ -502,6 +504,8 @@ angular.module('OpenSlidesApp.core.pdf', []) decimalColors[i] = hexString; } return '#' + decimalColors.join(''); + } else if (nameRegex.test(color)) { + return color; } else { console.error('Could not parse color "' + color + '"'); return color;