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

Merge pull request #3256 from FinnStutzenstein/Issue3243

Browse Source 
extending the color parser (fixes #3243)
This commit is contained in:
Emanuel Schütze 2017-05-19 08:46:32 +02:00 committed by GitHub
commit 3b2c7634f0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -492,10 +492,12 @@ angular.module('OpenSlidesApp.core.pdf', [])
// e.g. #fff or #ff0048 // e.g. #fff or #ff0048
var rgbRegex = new RegExp('^rgb\\((\\d+),\\s*(\\d+),\\s*(\\d+)\\)$'); var rgbRegex = new RegExp('^rgb\\((\\d+),\\s*(\\d+),\\s*(\\d+)\\)$');
// e.g. rgb(0,255,34) or rgb(22, 0, 0) // 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)) { if (hexRegex.test(color)) {
return color; return color;
} else if(rgbRegex.test(color)) { } else if (rgbRegex.test(color)) {
var decimalColors = rgbRegex.exec(color).slice(1); var decimalColors = rgbRegex.exec(color).slice(1);
for (var i = 0; i < 3; i++) { for (var i = 0; i < 3; i++) {
var decimalValue = parseInt(decimalColors[i]); var decimalValue = parseInt(decimalColors[i]);
@ -507,6 +509,8 @@ angular.module('OpenSlidesApp.core.pdf', [])
decimalColors[i] = hexString; decimalColors[i] = hexString;
} }
return '#' + decimalColors.join(''); return '#' + decimalColors.join('');
} else if (nameRegex.test(color)) {
return color;
} else { } else {
console.error('Could not parse color "' + color + '"'); console.error('Could not parse color "' + color + '"');
return color; return color;