Backing out changeset 48afd0b23600 (
Bug 813218) due to orange.
--- a/mail/base/content/extraCustomizeItems.xul
+++ b/mail/base/content/extraCustomizeItems.xul
@@ -67,22 +67,22 @@
oncommand="goDoCommand('button_compact');"
observes="button_compact"/>
<toolbaritem id="folder-location-container" insert-after="button-stop"
title="&folderLocationToolbarItem.title;"
align="center"
class="chromeclass-toolbar-additional">
<menulist id="locationFolders"
class="folderMenuItem"
- label="&folderLocationToolbarItem.title;"
+ label=" "
context="folderPaneContext"
- maxwidth="300"
+ width="170"
crop="center">
<menupopup id="folderLocationPopup"
- class="menulist-menupopup"
+ class="folderLocationPopup"
type="folder"
flex="1"
fileHereLabel="&filemessageschoosethis.label;"
showFileHereLabel="true"
oncommand="gFolderTreeView.selectFolder(event.target._folder);"/>
</menulist>
</toolbaritem>
<toolbaritem id="mailviews-container"
--- a/mail/themes/gnomestripe/mail/folderMenus.css
+++ b/mail/themes/gnomestripe/mail/folderMenus.css
@@ -96,8 +96,18 @@
-moz-image-region: rect(0px 80px 16px 64px);
}
/* Feed account node */
.folderMenuItem[IsServer="true"][ServerType="rss"] {
list-style-image: url("chrome://messenger/skin/icons/folder-pane.png");
-moz-image-region: rect(32px 16px 48px 0px);
}
+
+/* Make any sub-menu item of the folderLocationPopup act like a menuitem. */
+.folderLocationPopup menuitem,
+.folderLocationPopup menu {
+ -moz-padding-end: 30px;
+ padding-top: 0px;
+ padding-bottom: 0px;
+ max-width: none;
+ font: message-box;
+}
--- a/mail/themes/qute/mail/folderMenus.css
+++ b/mail/themes/qute/mail/folderMenus.css
@@ -95,8 +95,18 @@
.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
-moz-image-region: rect(0 80px 16px 64px) !important;
}
/* Feed server */
.folderMenuItem[IsServer="true"][ServerType="rss"] {
list-style-image: url("chrome://messenger-newsblog/skin/icons/server-rss.png");
}
+
+/* Make any sub-menu item of the folderLocationPopup act like a menuitem. */
+.folderLocationPopup menuitem,
+.folderLocationPopup menu {
+ -moz-padding-end: 30px;
+ padding-top: 0px;
+ padding-bottom: 0px;
+ max-width: none;
+ font: message-box;
+}
--- a/mailnews/base/content/folderWidgets.xml
+++ b/mailnews/base/content/folderWidgets.xml
@@ -26,40 +26,23 @@
while (node instanceof XULElement) {
if (/wrapper-.*/.test(node.id)) {
inWrapper = true;
break;
}
node = node.parentNode;
}
if (this.parentNode && this.parentNode.localName == "menulist" &&
- !inWrapper) {
- // If we were in a wrapper before and have a width stored, restore it now.
- if (this.hasAttribute("original-width")) {
- if (this.getAttribute("original-width") == "none")
- this.removeAttribute("width");
- else
- this.setAttribute("width", this.getAttribute("original-width"));
+ !inWrapper)
+ this._ensureInitialized();
- this.removeAttribute("original-width");
- }
- this._ensureInitialized();
- }
// But if we're in a wrapper, remove our children, because we're
// getting re-created when the toolbar customization closes.
- if (inWrapper) {
+ if (inWrapper)
this._teardown();
- // Store our current width and set a safe small width when we show
- // in a wrapper.
- if (!this.hasAttribute("original-width")) {
- this.setAttribute("original-width", this.hasAttribute("width") ?
- this.getAttribute("width") : "none");
- this.setAttribute("width", "100");
- }
- }
]]></constructor>
<destructor><![CDATA[
// Clean up when being destroyed.
this._removeListener();
]]></destructor>
<!--
- Make sure we remove our listener when the window is being destroyed
- or the widget teared down.
--- a/mailnews/extensions/newsblog/content/feed-subscriptions.xul
+++ b/mailnews/extensions/newsblog/content/feed-subscriptions.xul
@@ -121,17 +121,17 @@
control="selectFolder"/>
</hbox>
<hbox>
<menulist id="selectFolder"
flex="1"
class="folderMenuItem"
hidden="true">
<menupopup id="selectFolderPopup"
- class="menulist-menupopup"
+ class="folderLocationPopup"
type="folder"
mode="feeds"
showFileHereLabel="true"
showAccountsFileHere="true"
oncommand="FeedSubscriptions.setFolderPicker(event.target._folder)"/>
</menulist>
<textbox id="selectFolderValue"
flex="1"