Bug 1489737: Removing folderSummary-location; r=mkmelin
authorArshad Khan <arshdkhn1@gmail.com>
Sat, 08 Sep 2018 14:32:31 +0530
changeset 33302 042d0c2e51531351740c75b4b13e11430bbe6961
parent 33301 205e5b8392186d7fe9c28f5f08c33703ea0a8f3a
child 33303 9766dccdd8b8e23e7ac26f3bfa94449e8b5bf40d
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersmkmelin
bugs1489737
Bug 1489737: Removing folderSummary-location; r=mkmelin
mail/base/content/mailWidgets.xml
mail/base/content/messenger.css
--- a/mail/base/content/mailWidgets.xml
+++ b/mail/base/content/mailWidgets.xml
@@ -2424,36 +2424,36 @@
           <![CDATA[
             // Display also server name for items that are on level 0 and are not server names
             // by themselves and do not have server name already appended in their label.
             let folderIndex = gFolderTreeView.getIndexOfFolder(aFolder);
             if (!aFolder.isServer &&
                 gFolderTreeView.getLevel(folderIndex) == 0 &&
                 !gFolderTreeView.getServerNameAdded(folderIndex))
             {
-              let loc = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "folderSummaryLocation");
+              let loc = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "label");
               let midPath = "";
               let midFolder = aFolder.parent;
               while (aFolder.server.rootFolder != midFolder) {
                 midPath = midFolder.name + " - " + midPath;
                 midFolder = midFolder.parent;
               }
-              loc.setAttribute("location", aFolder.server.prettyName + " - " + midPath + aFolder.name);
+              loc.setAttribute("value", aFolder.server.prettyName + " - " + midPath + aFolder.name);
               document.getAnonymousNodes(this)[0].appendChild(loc);
               return true;
             }
 
             // If folder name is cropped or is a newsgroup and abbreviated per
             // pref, use the full name as a tooltip.
             if (aCropped ||
                 ((aFolder.server instanceof Ci.nsINntpIncomingServer) &&
                  !(aFolder.flags & Ci.nsMsgFolderFlags.Virtual) &&
                  aFolder.server.abbreviate) && !aFolder.isServer) {
-              let loc = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "folderSummaryLocation");
-              loc.setAttribute("location", aFolder.name);
+              let loc = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "label");
+              loc.setAttribute("value", aFolder.name);
               document.getAnonymousNodes(this)[0].appendChild(loc);
               return true;
             }
 
             return false;
           ]]>
         </body>
       </method>
@@ -2487,24 +2487,16 @@
         <![CDATA[
           ChromeUtils.import("resource:///modules/MailServices.jsm");
           ChromeUtils.import("resource://gre/modules/Services.jsm", this);
         ]]>
       </constructor>
     </implementation>
   </binding>
 
-  <binding id="folderSummary-location">
-    <content>
-      <xul:hbox>
-        <xul:label anonid="location" xbl:inherits="value=location"/>
-      </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
@@ -143,21 +143,16 @@ folderSummary
   -moz-binding: url("chrome://messenger/content/mailWidgets.xml#folderSummary");
 }
 
 folderSummaryMessage
 {
   -moz-binding: url("chrome://messenger/content/mailWidgets.xml#folderSummary-message");
 }
 
-folderSummaryLocation
-{
-  -moz-binding: url("chrome://messenger/content/mailWidgets.xml#folderSummary-location");
-}
-
 tabmail {
   -moz-binding: url("chrome://messenger/content/tabmail.xml#tabmail");
 }
 
 menupopup[type="folder"] {
   -moz-binding: url("chrome://messenger/content/folderWidgets.xml#folder-menupopup");
 }