Port Serge Gautherie's Thunderbird priority menu changes b=146075 r=Mnyromyr

mailnews/compose/resources/content/MsgComposeCommands.js

@@ -240,7 +240,6 @@ var gComposeRecyclingListener = {
 
     //Reset menu options
     document.getElementById("format_auto").setAttribute("checked", "true");
-    document.getElementById("priority_normal").setAttribute("checked", "true");
 
     //Reset toolbars that could be hidden
     if (gHideMenus) {
@@ -2030,20 +2029,24 @@ function MessageFcc(menuItem)
   }
 }
 
+function updatePriorityMenu(priorityMenu)
+{
+  if (gMsgCompose)
+  {
+    var msgCompFields = gMsgCompose.compFields;
+    if (msgCompFields && msgCompFields.priority)
+      priorityMenu.getElementsByAttribute("value", msgCompFields.priority)[0]
+                  .setAttribute("checked", "true");
+  }
+}
+
 function PriorityMenuSelect(target)
 {
   if (gMsgCompose)
   {
     var msgCompFields = gMsgCompose.compFields;
     if (msgCompFields)
-      switch (target.getAttribute('id'))
+      msgCompFields.priority = target.getAttribute("value");
-      {
-        case "priority_lowest":  msgCompFields.priority = "Lowest";   break;
-        case "priority_low":     msgCompFields.priority = "Low";      break;
-        case "priority_normal":  msgCompFields.priority = "Normal";   break;
-        case "priority_high":    msgCompFields.priority = "High";     break;
-        case "priotity_highest": msgCompFields.priority = "Highest";  break;
-      }
   }
 }
 

mailnews/compose/resources/content/messengercompose.xul

@@ -355,12 +355,12 @@
             </menupopup>
           </menu>
           <menu id="priorityMenu" label="&priorityMenu.label;" accesskey="&priorityMenu.accesskey;" oncommand="PriorityMenuSelect(event.target);">
-            <menupopup>
+            <menupopup onpopupshowing="updatePriorityMenu(this);">
-              <menuitem type="radio" name="priority" label="&lowestPriorityCmd.label;" accesskey="&lowestPriorityCmd.accesskey;" id="priority_lowest"/>
+              <menuitem type="radio" name="priority" label="&highestPriorityCmd.label;" accesskey="&highestPriorityCmd.accesskey;" value="Highest"/>
-              <menuitem type="radio" name="priority" label="&lowPriorityCmd.label;" accesskey="&lowPriorityCmd.accesskey;" id="priority_low"/>
+              <menuitem type="radio" name="priority" label="&highPriorityCmd.label;" accesskey="&highPriorityCmd.accesskey;" value="High"/>
-              <menuitem type="radio" name="priority" label="&normalPriorityCmd.label;" accesskey="&normalPriorityCmd.accesskey;" id="priority_normal" checked="true"/>
+              <menuitem type="radio" name="priority" label="&normalPriorityCmd.label;" accesskey="&normalPriorityCmd.accesskey;" value="Normal"/>
-              <menuitem type="radio" name="priority" label="&highPriorityCmd.label;" accesskey="&highPriorityCmd.accesskey;" id="priority_high"/>
+              <menuitem type="radio" name="priority" label="&lowPriorityCmd.label;" accesskey="&lowPriorityCmd.accesskey;" value="Low"/>
-              <menuitem type="radio" name="priority" label="&highestPriorityCmd.label;" accesskey="&highestPriorityCmd.accesskey;" id="priotity_highest"/>
+              <menuitem type="radio" name="priority" label="&lowestPriorityCmd.label;" accesskey="&lowestPriorityCmd.accesskey;" value="Lowest"/>
             </menupopup>
           </menu>
           <menu id="maileditCharsetMenu" />