Backout changeset 4cc9ac6460cf / bug 780425 due to unit test failures

This commit is contained in:
Mark Banner 2012-08-21 13:26:01 +01:00
Родитель 200c647e31
Коммит 389a158bf2
3 изменённых файлов: 7 добавлений и 124 удалений

Просмотреть файл

@ -190,13 +190,9 @@
const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
let item = this.ownerDocument.createElementNS(XULNS, "attachmentitem");
item.setAttribute("name", name || attachment.name);
let size;
if (attachment.size != null && attachment.size != -1)
size = this.messenger.formatFileSize(attachment.size);
else // Use a zero-width space so the size label has the right height.
size = "\u200b";
item.setAttribute("size", size);
item.setAttribute("size", this.messenger.formatFileSize(
attachment.size));
// Pick out some nice icons (small and large) for the attachment
if (attachment.contentType == "text/x-moz-deleted") {
@ -367,17 +363,11 @@
<implementation>
<method name="setOptimumWidth">
<body><![CDATA[
if (this._childNodes.length == 0)
return;
let width = 0;
let border = this._childNodes[0].boxObject.width -
this._childNodes[0].clientWidth;
for (let child of this._childNodes)
width = Math.max(width, child.scrollWidth);
for (let child of this._childNodes)
child.width = width + border;
for (let i = 0; i < this._childNodes.length; i++)
width = Math.max(width, this._childNodes[i].scrollWidth);
for (let i = 0; i < this._childNodes.length; i++)
this._childNodes[i].width = width;
]]></body>
</method>
</implementation>

Просмотреть файл

@ -323,7 +323,7 @@ classic.jar:
skin/classic/aero/messenger/webSearch.css (mail/webSearch-aero.css)
skin/classic/aero/messenger/messageQuotes.css (mail/messageQuotes.css)
* skin/classic/aero/messenger/messenger.css (mail/messenger-aero.css)
* skin/classic/aero/messenger/attachmentList.css (mail/attachmentList-aero.css)
skin/classic/aero/messenger/attachmentList.css (mail/attachmentList.css)
skin/classic/aero/messenger/imageFilters.svg (mail/imageFilters.svg)
* skin/classic/aero/messenger/mailWindow1.css (mail/mailWindow1-aero.css)
* skin/classic/aero/messenger/tagColors.css (mail/tagColors-aero.css)

Просмотреть файл

@ -1,107 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* styles for the attachment list */
%include attachmentList.css
@media (-moz-windows-default-theme) {
attachmentitem {
margin: 1px 0 0 0;
pointer-events: auto !important;
border: 2px solid transparent;
border-radius: 3px;
color: -moz-FieldText;
background-color: transparent;
background-repeat: no-repeat;
background-size: 100% 100%;
}
.attachmentlist-wrapper {
margin: 0 1px 1px 0;
}
attachmentlist[orient="horizontal"] > attachmentitem {
margin: 1px 0 0 1px;
}
.attachmentcell-nameselection {
outline: none !important;
background-color: inherit !important;
color: inherit !important;
}
.attachmentcell-icon {
filter: none !important;
padding: 0 1px;
}
.attachmentcell-name, .attachmentcell-size {
margin: 0px 4px 0px 4px;
}
attachmentitem[selected="true"] {
-moz-border-top-colors: rgb(217, 217, 217) rgba(255,255,255,.4);
-moz-border-right-colors: rgb(217, 217, 217) rgba(255,255,255,.4);
-moz-border-left-colors: rgb(217, 217, 217) rgba(255,255,255,.4);
-moz-border-bottom-colors: rgb(217, 217, 217) rgba(255,255,255,.6);
background-image: -moz-linear-gradient(rgba(190, 190, 190, 0.1),
rgba(190, 190, 190, 0.4));
}
attachmentitem[selected="true"]:hover {
-moz-border-top-colors: rgb(125, 162, 206) rgba(255,255,255,.4);
-moz-border-right-colors: rgb(125, 162, 206) rgba(255,255,255,.4);
-moz-border-left-colors: rgb(125, 162, 206) rgba(255,255,255,.4);
-moz-border-bottom-colors: rgb(125, 162, 206) rgba(255,255,255,.6);
background-image: -moz-linear-gradient(rgba(131, 183, 249, 0.28),
rgba(131, 183, 249, 0.50));
}
attachmentlist:focus > attachmentitem[current="true"] {
-moz-border-top-colors: rgb(125, 162, 206) transparent;
-moz-border-right-colors: rgb(125, 162, 206) transparent;
-moz-border-left-colors: rgb(125, 162, 206) transparent;
-moz-border-bottom-colors: rgb(125, 162, 206) transparent;
}
attachmentlist:focus > attachmentitem[current="true"]:hover {
-moz-border-top-colors: rgb(125, 162, 206) rgba(255,255,255,.4);
-moz-border-right-colors: rgb(125, 162, 206) rgba(255,255,255,.4);
-moz-border-left-colors: rgb(125, 162, 206) rgba(255,255,255,.4);
-moz-border-bottom-colors: rgb(125, 162, 206) rgba(255,255,255,.6);
background-image: -moz-linear-gradient(rgba(131, 183, 249, 0.05),
rgba(131, 183, 249, 0.16));
}
attachmentlist:focus > attachmentitem[selected="true"] {
-moz-border-top-colors: rgb(132, 172, 221) rgba(255,255,255,.4);
-moz-border-right-colors: rgb(132, 172, 221) rgba(255,255,255,.4);
-moz-border-left-colors: rgb(132, 172, 221) rgba(255,255,255,.4);
-moz-border-bottom-colors: rgb(132, 172, 221) rgba(255,255,255,.6);
background-image: -moz-linear-gradient(rgba(131, 183, 249, 0.16),
rgba(131, 183, 249, 0.375));
}
attachmentlist:focus > attachmentitem[selected="true"][current="true"] {
-moz-border-top-colors: rgb(125, 162, 206) rgba(255,255,255,.4);
-moz-border-right-colors: rgb(125, 162, 206) rgba(255,255,255,.4);
-moz-border-left-colors: rgb(125, 162, 206) rgba(255,255,255,.4);
-moz-border-bottom-colors: rgb(125, 162, 206) rgba(255,255,255,.6);
background-image: -moz-linear-gradient(rgba(131, 183, 249, 0.28),
rgba(131, 183, 249, 0.50));
}
attachmentitem:hover {
-moz-border-top-colors: rgb(184, 214, 251) rgba(255,255,255,.4);
-moz-border-right-colors: rgb(184, 214, 251) rgba(255,255,255,.4);
-moz-border-left-colors: rgb(184, 214, 251) rgba(255,255,255,.4);
-moz-border-bottom-colors: rgb(184, 214, 251) rgba(255,255,255,.6);
background-image: -moz-linear-gradient(rgba(131, 183, 249, 0.05),
rgba(131, 183, 249, 0.16));
}
}