Bug 1440923 - Port bug 1440491 to TB: Remove [persist] attribute from elements without IDs. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sat, 24 Feb 2018 15:49:53 +0100
changeset 31166 023618a6bc8ddd800a6e56565aad60a39c847c36
parent 31165 5aeb32aaa92b73257d9b47673a85306814834bf9
child 31167 77fe0ec955eabe5f8ac6dde4b807f2cd670929b2
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersjorgk
bugs1440923, 1440491
Bug 1440923 - Port bug 1440491 to TB: Remove [persist] attribute from elements without IDs. r=jorgk
mail/base/content/mailWindowOverlay.xul
mail/base/content/messenger.xul
mail/base/content/msgMail3PaneWindow.js
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -3163,18 +3163,20 @@
 
       <!-- Help -->
       <menu id="helpMenu"/>
 
       <spacer id="menubar_spacer" flex="100%"/>
       </menubar>
     </toolbaritem>
 #ifdef CAN_DRAW_IN_TITLEBAR
+#ifndef XP_MACOSX
     <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
 #endif
+#endif
   </toolbar>
 </toolbox>
 
 <toolbox id="mail-toolbox"
          class="mail-toolbox"
          mode="full"
          defaultmode="full"
 #ifdef XP_MACOSX
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -275,25 +275,22 @@
                      hidden="true"
                      tooltiptext="&listAllTabs.label;">
         <menupopup class="tabs-alltabs-popup"
                    id="alltabs-popup" position="after_end"
                    tabcontainer="tabmail-tabs"/>
       </toolbarbutton>
 #ifdef CAN_DRAW_IN_TITLEBAR
       <hbox class="titlebar-placeholder" type="caption-buttons"
-            id="titlebar-placeholder-on-TabsToolbar-for-captions-buttons" persist="width"
 #ifndef XP_MACOSX
             ordinal="1000"
 #endif
             />
 #ifdef XP_MACOSX
-      <hbox class="titlebar-placeholder" type="fullscreen-button"
-            id="titlebar-placeholder-on-TabsToolbar-for-fullscreen-button" persist="width"
-            />
+      <hbox class="titlebar-placeholder" type="fullscreen-button"/>
 #endif
 #endif
     </toolbar>
 
   </toolbox>
 
   <!-- XXX This extension point (tabmail-container) is only temporary!
        Horizontal space shouldn't be wasted if it isn't absolutely critical.
--- a/mail/base/content/msgMail3PaneWindow.js
+++ b/mail/base/content/msgMail3PaneWindow.js
@@ -1915,17 +1915,17 @@ var TabsInTitlebar = {
       menubar.style.paddingBottom = "";
     }
 
     ToolbarIconColor.inferFromText();
   },
 
   _sizePlaceholder(type, width) {
     Array.forEach(document.querySelectorAll(".titlebar-placeholder[type='" + type + "']"),
-                  function(node) { node.width = width; });
+                  function(node) { node.style.width = width + "px"; });
   },
 
   uninit() {
     if (AppConstants.CAN_DRAW_IN_TITLEBAR) {
       this._initialized = false;
       Services.prefs.removeObserver(this._drawInTitlePref, this);
       Services.prefs.removeObserver(this._autoHidePref, this);
       this._menuObserver.disconnect();