Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 07:52:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix protect color pick from wrong user input.

Browse source
This commit is contained in:
Daniela 2017-09-21 17:17:36 +01:00
parent d960a7c42e
commit 9787c31d70
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/system/fingerPaint/html/colorsTab.html
View file

@ -106,6 +106,14 @@
addColors();
function clampColors(colorArray){
colorArray[0] = Math.min(Math.max(colorArray[0], 0), 255);
colorArray[1] = Math.min(Math.max(colorArray[1], 0), 255);
colorArray[2] = Math.min(Math.max(colorArray[2], 0), 255);
$('#colorpicker').colpickSetColor({'r': colorArray[0], 'g': colorArray[1], 'b': colorArray[2]}, true);
}
function update(colorArray) {
// 'jscolor' instance can be used as a string
var changedColorEvent = {
@ -120,6 +128,13 @@
}
function updateFromCustomPicker(colorArray) {
if (colorArray[0] != Math.min(Math.max(colorArray[0], 0), 255)
|| colorArray[1] != Math.min(Math.max(colorArray[1], 0), 255)
|| colorArray[2] != Math.min(Math.max(colorArray[2], 0), 255)) {
clampColors(colorArray);
return;
}
var tableColor = document.getElementById("table(" + colorArray[0] + "," + colorArray[1] + "," + colorArray[2] + ")");
var userColor = document.getElementById("user(" + colorArray[0] + "," + colorArray[1] + "," + colorArray[2] + ")");
if (tableColor) {