Set radio button to 'Cell' if cell is selected when setting background color. b=98194, r=brade, sr=hewitt

editor/ui/composer/content/editor.js

@@ -1075,6 +1075,7 @@ function GetBackgroundElementWithColor()
   gColorObj.TableColor = "";
   gColorObj.CellColor = "";
   gColorObj.BackgroundColor = "";
+  gColorObj.SelectedType = "";
 
   var tagNameObj = new Object();
   var numSelected;
@@ -1105,6 +1106,7 @@ function GetBackgroundElementWithColor()
       gColorObj.Type = "Table";
       gColorObj.TableColor = gColorObj.BackgroundColor;
     }
+    gColorObj.SelectedType = gColorObj.Type;
   }
   else
   {

editor/ui/dialogs/content/EdColorPicker.js

@@ -106,18 +106,18 @@ function Startup()
       TableOrCell = true;
       document.getElementById("TableOrCellGroup").setAttribute("collapsed", "false");
       haveTableRadio = true;
-      if (gColorObj.TableColor)
-      {
-        gColor = gColorObj.TableColor;
-        gDialog.CellOrTableGroup.selectedItem = gDialog.TableRadio;
-        gDialog.TableRadio.focus();
-      }
-      else 
+      if (gColorObj.SelectedType == "Cell")
       {
         gColor = gColorObj.CellColor;
         gDialog.CellOrTableGroup.selectedItem = gDialog.CellRadio;
         gDialog.CellRadio.focus();
       }
+      else
+      {
+        gColor = gColorObj.TableColor;
+        gDialog.CellOrTableGroup.selectedItem = gDialog.TableRadio;
+        gDialog.TableRadio.focus();
+      }
       break;
     case "Highlight":
       HighlightType = true;