diff --git a/www/extras/colorPicker.js b/www/extras/colorPicker.js
index 55a13fe7f..1d7985d35 100644
--- a/www/extras/colorPicker.js
+++ b/www/extras/colorPicker.js
@@ -76,19 +76,19 @@ function HEXcolor2RGB(value){
}
-function buildPicker(){
- htmlStr = "
";
+function buildColorPicker(){
+ htmlStr = "";
//palet
for(x=0;x<=255;x=x+bit){
for(y=0;y<=255;y=y+bit){
- htmlStr+= " | ";
+ htmlStr+= " | ";
}
htmlStr+= "
";
}
//grays
for(x=0;x<=255;x=x+bit){
c = dec2hex(x)+dec2hex(x)+dec2hex(x);
- htmlStr+= " | ";
+ htmlStr+= " | ";
}
htmlStr+= "
";
@@ -111,10 +111,10 @@ function changePickerHue(){
b = 255;
gS = 0;
bS = 1;
- htmlStr = "";
+ htmlStr = "";
for(r=0;r<=255;r=r+bit){
c = dec2hex(r)+dec2hex(g)+dec2hex(b);
- htmlStr+= " |
";
+ htmlStr+= " |
";
if(g == 255) gS = 1;
else if(g == 0) gS = 0;
@@ -132,7 +132,7 @@ function changePickerHue(){
else
b = b - 16;
}
- htmlStr+= " |
";
+ htmlStr+= " |
";
htmlStr+= "
";
return htmlStr;
@@ -154,7 +154,7 @@ function setPickedColorFromForm(obj){
}
-function placePickerToolbar(obj){
+function placeColorPickerToolbar(obj){
lastClickedPicker = clickedPicker;
clickedPicker = obj.id;
if(tmr)
@@ -185,9 +185,9 @@ function placePickerToolbar(obj){
}
-function killPicker(sw){
+function killColorPicker(sw){
if(sw == 1 && clickedPicker){
- tmr = setTimeout('placePickerToolbar(document.getElementById(clickedPicker));',300);
+ tmr = setTimeout('placeColorPickerToolbar(document.getElementById(clickedPicker));',300);
}else if(tmr){
clearTimeout(tmr);
}
@@ -195,18 +195,18 @@ function killPicker(sw){
function initColorPicker(fieldName,fieldValue){
- pickerScreen = buildPicker();
+ pickerScreen = buildColorPicker();
hueScreen = changePickerHue();
if(!fieldValue)
fieldValue = "";
if(donePickerInits == 0){
- document.write("");
+ document.write("");
document.getElementById('colorPickerTools').innerHTML = '| '+pickerScreen+' | '+hueScreen+' |
|
';
}
s = "";
document.write(s);