Fix for bug 34563. Replace HTML elements by XUL widget

mailnews/compose/resources/content/askSendFormat.js

@@ -3,8 +3,6 @@ var param = null;
 
 function Startup()
 {
-	/* dump("Startup()\n"); */
-
 	if (window.arguments && window.arguments[0] && window.arguments[0])
     {
 		param = window.arguments[0];
@@ -12,9 +10,11 @@ function Startup()
 		if (param.action)
 		{
 		    //Set the default radio array value
+		    var group = document.getElementById("mailDefaultHTMLAction");
 		    var element = document.getElementById("SendPlainTextAndHtml");
-		    element.checked = true;
-		    
+			group.selectedItem= element;
+			group.data = element.data;
+
 		    //change the button label
 		    labels = document.getElementById("okCancelButtons");
 		    element = document.getElementById("ok");
@@ -47,12 +47,12 @@ function Send()
 {
     if (param)
     {
-        if (document.getElementById("SendPlainTextAndHtml").checked)
-            param.action = msgCompSendFormat.Both;
-        else if (document.getElementById("SendPlainTextOnly").checked)
-            param.action = msgCompSendFormat.PlainText;
-        else if (document.getElementById("SendHtmlOnly").checked)
-            param.action = msgCompSendFormat.HTML;
+		switch (document.getElementById("mailDefaultHTMLAction").data)
+		{
+			case "0": param.action = msgCompSendFormat.Both;		break;
+			case "1": param.action = msgCompSendFormat.PlainText;	break;
+			case "2": param.action = msgCompSendFormat.HTML;		break;
+		}
         param.abort = false;
     }
     return true;

mailnews/compose/resources/content/askSendFormat.xul

@@ -22,23 +22,15 @@
     <box align="horizontal">
         <spring style="width:10px"/>
         <box align="vertical">
-            <html:div style="width:40em"> &question.label; </html:div>
+            <text value="&question.label;" />
             
             <spring style="height:1em"/>
-        	<html:div>
-        		<html:input id="SendPlainTextAndHtml" class="indent" name="sendFormat" type="radio"/>
-        		<html:label for="SendPlainTextAndHtml">&plainTextAndHtml.label;</html:label>
-        	</html:div>
 
-        	<html:div>
-        		<html:input id="SendPlainTextOnly" class="indent" name="sendFormat" type="radio"/>
-        		<html:label for="SendPlainTextOnly">&plainTextOnly.label;</html:label>
-        	</html:div>
-
-        	<html:div>
-        		<html:input id="SendHtmlOnly" class="indent" name="sendFormat" type="radio"/>
-        		<html:label for="SendHtmlOnly">&htmlOnly.label;</html:label>
-        	</html:div>
+			<radiogroup id="mailDefaultHTMLAction" orient="vertical" autostretch="never">
+				<radio id="SendPlainTextAndHtml" data="0" value="&plainTextAndHtml.label;"/>                
+				<radio id="SendPlainTextOnly" data="1" value="&plainTextOnly.label;"/>
+				<radio id="SendHtmlOnly" data="2" value="&htmlOnly.label;"/>
+			</radiogroup>
         </box>
         <spring style="width:10px"/>
     </box>