Bug 1489747 - Remove folderSummary-subfoldersSummary binding. r=mkmelin
authorArshad Khan <arshdkhn1@gmail.com>
Sat, 08 Sep 2018 14:42:10 +0530
changeset 33293 54787af6beb08a2240d9152852c46344e438dc24
parent 33292 f929f9f1b39c927af3aa30231ca7dde95b330995
child 33294 c42d9a24749dc13ff6ccfbd3780828613cd8faf0
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersmkmelin
bugs1489747
Bug 1489747 - Remove folderSummary-subfoldersSummary binding. r=mkmelin
mail/base/content/mailWidgets.xml
mail/base/content/messenger.css
--- a/mail/base/content/mailWidgets.xml
+++ b/mail/base/content/mailWidgets.xml
@@ -2525,20 +2525,20 @@
       </method>
 
       <method name="addSummarizeExplain">
         <parameter name="aCounts"/>
         <body>
           <![CDATA[
             if (!aCounts || !aCounts[1])
               return false;
-            let expl = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "folderSummarySubfoldersSummary");
+            let expl = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "label");
             let sumString = document.getElementById("bundle_messenger")
                                     .getFormattedString("subfoldersExplanation", [aCounts[0], aCounts[1]], 2);
-            expl.setAttribute("subfolders", sumString);
+            expl.setAttribute("value", sumString);
             document.getAnonymousNodes(this)[0].appendChild(expl);
             return true;
           ]]>
         </body>
       </method>
 
       <method name="clear">
         <body>
@@ -2561,24 +2561,16 @@
   <binding id="folderSummary-location">
     <content>
       <xul:hbox>
         <xul:label anonid="location" xbl:inherits="value=location"/>
       </xul:hbox>
     </content>
   </binding>
 
-  <binding id="folderSummary-subfoldersSummary">
-    <content>
-      <xul:hbox>
-        <xul:label anonid="subfolders" xbl:inherits="value=subfolders"/>
-      </xul:hbox>
-    </content>
-  </binding>
-
   <binding id="folderSummary-message">
     <content>
       <xul:vbox class="folderSummaryMessage">
         <xul:hbox class="folderSummary-message-row">
           <xul:label anonid="subject" flex="1" class="folderSummary-subject" xbl:inherits="value=subject" crop="right"/>
           <xul:label anonid="sender"  class="folderSummary-sender" xbl:inherits="value=sender" crop="right"/>
           <xul:spring anonid="spring" flex="100%"/>
         </xul:hbox>
--- a/mail/base/content/messenger.css
+++ b/mail/base/content/messenger.css
@@ -152,21 +152,16 @@ folderSummaryMessage
   -moz-binding: url("chrome://messenger/content/mailWidgets.xml#folderSummary-message");
 }
 
 folderSummaryLocation
 {
   -moz-binding: url("chrome://messenger/content/mailWidgets.xml#folderSummary-location");
 }
 
-folderSummarySubfoldersSummary
-{
-  -moz-binding: url("chrome://messenger/content/mailWidgets.xml#folderSummary-subfoldersSummary");
-}
-
 tabmail {
   -moz-binding: url("chrome://messenger/content/tabmail.xml#tabmail");
 }
 
 menupopup[type="folder"] {
   -moz-binding: url("chrome://messenger/content/folderWidgets.xml#folder-menupopup");
 }