mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 05:45:37 +00:00
Fixed setting of intial focus in Composer colorpicker dialog (part of fix to 64160, forgot to checkin before)r=kin, sr=hewitt, a=asa-drivers
This commit is contained in:
parent
60dcb7fcdb
commit
15fa77bd76
@ -76,6 +76,7 @@ function Startup()
|
||||
|
||||
dialog.ColorInput.value = "";
|
||||
var tmpColor;
|
||||
var haveTableRadio = false;
|
||||
|
||||
switch (ColorType)
|
||||
{
|
||||
@ -95,15 +96,18 @@ function Startup()
|
||||
case "TableOrCell":
|
||||
TableOrCell = true;
|
||||
document.getElementById("TableOrCellGroup").setAttribute("collapsed", "false");
|
||||
haveTableRadio = true;
|
||||
if (gColorObj.TableColor)
|
||||
{
|
||||
color = gColorObj.TableColor;
|
||||
dialog.TableRadio.checked = true;
|
||||
dialog.TableRadio.focus();
|
||||
}
|
||||
else
|
||||
{
|
||||
color = gColorObj.CellColor;
|
||||
dialog.CellRadio.checked = true;
|
||||
dialog.CellRadio.focus();
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@ -115,7 +119,8 @@ function Startup()
|
||||
break;
|
||||
}
|
||||
|
||||
SetCurrentColor(color)
|
||||
// Set initial color in input field and in the colorpicker
|
||||
dialog.ColorPicker.color = color;
|
||||
|
||||
// Use last-picked colors passed in, or those persistent on dialog
|
||||
if (TextType)
|
||||
@ -151,7 +156,9 @@ function Startup()
|
||||
document.getElementById("DefaultColorButton").setAttribute("collapsed","true");
|
||||
}
|
||||
|
||||
SetTextboxFocus(dialog.ColorInput);
|
||||
// Set focus to colorpicker if not set to table radio buttons above
|
||||
if (!haveTableRadio)
|
||||
dialog.ColorPicker.focus();
|
||||
|
||||
SetWindowLocation();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user