wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #24049 from owncloud/skjnldsv-fix-colors-values

Browse source 
Fix rgb values
This commit is contained in:
Thomas Müller 2016-04-19 06:59:14 +02:00
commit 00ad23f3c1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/js/placeholder.js
View file

@ -92,7 +92,7 @@
// Init vars // Init vars
var result = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; var result = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
var rgb = [0, 0, 0]; var rgb = [0, 0, 0];
var sat = 80; var sat = 70;
var lum = 68; var lum = 68;
var modulo = 16; var modulo = 16;
@ -106,6 +106,12 @@
for(var count=1;count<modulo;count++) { for(var count=1;count<modulo;count++) {
rgb[count%3] += parseInt(result[count]); rgb[count%3] += parseInt(result[count]);
} }
// Reduce values bigger than rgb requirements
rgb[0] = rgb[0]%255;
rgb[1] = rgb[1]%255;
rgb[2] = rgb[2]%255;
var hsl = rgbToHsl(rgb[0], rgb[1], rgb[2]); var hsl = rgbToHsl(rgb[0], rgb[1], rgb[2]);
// Classic formulla to check the brigtness for our eye // Classic formulla to check the brigtness for our eye