Bug 1628497 - Revert to dot-ID for identityHtmlSigFormat to fix the "Use HTML" checkbox. r=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Thu, 28 May 2020 18:58:36 +0300
changeset 39258 53bd3a77386ec329a600c06b6aabc5d344252328
parent 39257 00e93f6c59c33a902d1e853fc96cafcd6b7d21e5
child 39259 28d70f3af773ffbef4691ac052576dcc2750637b
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersmkmelin
bugs1628497
Bug 1628497 - Revert to dot-ID for identityHtmlSigFormat to fix the "Use HTML" checkbox. r=mkmelin The wsm_persist looks at the ids this way...
mail/themes/shared/mail/accountManage.css
mailnews/base/prefs/content/am-identity-edit.js
mailnews/base/prefs/content/am-identity-edit.xhtml
mailnews/base/prefs/content/am-main.xhtml
--- a/mail/themes/shared/mail/accountManage.css
+++ b/mail/themes/shared/mail/accountManage.css
@@ -225,17 +225,17 @@ treechildren::-moz-tree-image(folderName
 
 .label-inline {
   margin-block: auto;
   min-width: 200px;
 }
 
 #defaultPort,
 #servertypeVerbose,
-#identityHtmlSigFormat {
+#identity\.htmlSigFormat {
   margin-inline-start: 4px;
 }
 
 #autosyncNotDownload {
   margin-inline-end: 12px;
 }
 
 /* ::::: SMTP Server Panel :::::: */
--- a/mailnews/base/prefs/content/am-identity-edit.js
+++ b/mailnews/base/prefs/content/am-identity-edit.js
@@ -53,17 +53,17 @@ function initIdentityValues(identity) {
     document.getElementById("identity.email").value = identity.email;
     document.getElementById("identity.replyTo").value = identity.replyTo;
     document.getElementById("identity.organization").value =
       identity.organization;
     document.getElementById("identity.attachSignature").checked =
       identity.attachSignature;
     document.getElementById("identity.htmlSigText").value =
       identity.htmlSigText;
-    document.getElementById("identityHtmlSigFormat").checked =
+    document.getElementById("identity.htmlSigFormat").checked =
       identity.htmlSigFormat;
 
     if (identity.signature) {
       document.getElementById("identity.signature").value =
         identity.signature.path;
     }
 
     document.getElementById("identity.attachVCard").checked =
@@ -241,17 +241,17 @@ function saveIdentitySettings(identity) 
     ).value;
     identity.attachSignature = document.getElementById(
       "identity.attachSignature"
     ).checked;
     identity.htmlSigText = document.getElementById(
       "identity.htmlSigText"
     ).value;
     identity.htmlSigFormat = document.getElementById(
-      "identityHtmlSigFormat"
+      "identity.htmlSigFormat"
     ).checked;
 
     identity.attachVCard = document.getElementById(
       "identity.attachVCard"
     ).checked;
     identity.escapedVCard = document.getElementById(
       "identity.escapedVCard"
     ).value;
@@ -393,17 +393,17 @@ function GetSigFolder() {
 // displays the absolute path to the signature (in a textbox) and the way
 // to select a new signature file (a button) are enabled. Otherwise, they
 // are disabled. Check to see if the attachSignature is locked to block
 // broadcasting events.
 function setupSignatureItems() {
   var signature = document.getElementById("identity.signature");
   var browse = document.getElementById("identity.sigbrowsebutton");
   var htmlSigText = document.getElementById("identity.htmlSigText");
-  var htmlSigFormat = document.getElementById("identityHtmlSigFormat");
+  var htmlSigFormat = document.getElementById("identity.htmlSigFormat");
   var attachSignature = document.getElementById("identity.attachSignature");
   var checked = attachSignature.checked;
 
   if (checked) {
     htmlSigText.setAttribute("disabled", "disabled");
     htmlSigFormat.setAttribute("disabled", "true");
   } else {
     htmlSigText.removeAttribute("disabled");
--- a/mailnews/base/prefs/content/am-identity-edit.xhtml
+++ b/mailnews/base/prefs/content/am-identity-edit.xhtml
@@ -121,17 +121,17 @@
               </html:td>
             </html:tr>
             <html:tr>
               <html:th>
                 <label value="&signatureText.label;" control="identity.htmlSigText"
                        accesskey="&signatureText.accesskey;"/>
               </html:th>
               <html:td style="width:100%;">
-                <checkbox id="identityHtmlSigFormat" label="&signatureHtml.label;"
+                <checkbox id="identity.htmlSigFormat" label="&signatureHtml.label;"
                           accesskey="&signatureHtml.accesskey;" style="width:100%;"/>
               </html:td>
             </html:tr>
           </html:table>
 
           <separator class="thin"/>
 
           <hbox class="indent input-container" flex="1">
--- a/mailnews/base/prefs/content/am-main.xhtml
+++ b/mailnews/base/prefs/content/am-main.xhtml
@@ -107,17 +107,17 @@
         </html:tr>
         <html:tr>
           <html:th>
             <label value="&signatureText.label;" control="identity.htmlSigText"
                    accesskey="&signatureText.accesskey;"/>
           </html:th>
           <html:td style="width:100%;">
             <hbox align="center">
-              <checkbox id="identityHtmlSigFormat" wsm_persist="true" label="&signatureHtml.label;"
+              <checkbox id="identity.htmlSigFormat" wsm_persist="true" label="&signatureHtml.label;"
                         prefattribute="value" accesskey="&signatureHtml.accesskey;" style="width:100%;"
                         prefstring="mail.identity.%identitykey%.htmlSigFormat"/>
             </hbox>
           </html:td>
         </html:tr>
       </html:table>
 
       <hbox class="indent" flex="1" style="min-height:100px; display:flex;">