Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #345650 --> mailnews.max_header_display_length is now obsolete, remove it. Remove callers to get/setTextAttribute on an email address node, use get/set attribute instead. r=neil

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@203560 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org 2006-07-24 22:05:14 +00:00
parent 17d6b42c02
commit 97e1db8a95
4 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/mail/base/content/msgHdrViewOverlay.js
View File

@ -59,7 +59,6 @@ const kLargeIcon = 32;
const kSmallIcon = 16;
var gViewAllHeaders = false;
var gNumAddressesToShow = 3;
var gShowOrganization = false;
var gShowLargeAttachmentView = false;
var gShowUserAgent = false;
@ -236,7 +235,6 @@ function OnLoadMsgHeaderPane()
// load any preferences that at are global with regards to
// displaying a message...
gNumAddressesToShow = pref.getIntPref("mailnews.max_header_display_length");
gShowUserAgent = pref.getBoolPref("mailnews.headers.showUserAgent");
gMinNumberOfHeaders = pref.getIntPref("mailnews.headers.minNumHeaders");
gShowOrganization = pref.getBoolPref("mailnews.headers.showOrganization");
@ -903,7 +901,7 @@ function OutputEmailAddresses(headerEntry, emailAddresses)
}
if (headerEntry.useToggle)
headerEntry.enclosingBox.buildViews(gNumAddressesToShow);
headerEntry.enclosingBox.buildViews();
} // if msgheader parser
}
@ -911,12 +909,11 @@ function updateEmailAddressNode(emailAddressNode, address)
{
emailAddressNode.setAttribute("label", address.fullAddress || address.displayName);
emailAddressNode.removeAttribute("tooltiptext");
emailAddressNode.setTextAttribute("emailAddress", address.emailAddress);
emailAddressNode.setTextAttribute("fullAddress", address.fullAddress);
emailAddressNode.setTextAttribute("displayName", address.displayName);
if ("AddExtraAddressProcessing" in this)
AddExtraAddressProcessing(address.emailAddress, emailAddressNode);
emailAddressNode.setAttribute("emailAddress", address.emailAddress);
emailAddressNode.setAttribute("fullAddress", address.fullAddress);
emailAddressNode.setAttribute("displayName", address.displayName);
AddExtraAddressProcessing(address.emailAddress, emailAddressNode);
}
// thunderbird has smart logic for determining if we should show just the display name.
@ -926,8 +923,8 @@ function updateEmailAddressNode(emailAddressNode, address)
function AddExtraAddressProcessing(emailAddress, addressNode)
{
var displayName = addressNode.getTextAttribute("displayName");
var mailAddress = addressNode.getTextAttribute("emailAddress");
var displayName = addressNode.getAttribute("displayName");
var mailAddress = addressNode.getAttribute("emailAddress");
// always show the address for the from and reply-to fields
var parentElementId = addressNode.parentNode.id;
@ -948,7 +945,7 @@ function AddExtraAddressProcessing(emailAddress, addressNode)
function fillEmailAddressPopup(emailAddressNode)
{
var emailAddressPlaceHolder = document.getElementById('emailAddressPlaceHolder');
var emailAddress = emailAddressNode.getTextAttribute('emailAddress');
var emailAddress = emailAddressNode.getAttribute('emailAddress');
emailAddressPlaceHolder.setAttribute('label', emailAddress);
}
@ -957,7 +954,7 @@ function fillEmailAddressPopup(emailAddressNode)
// Public method called to generate a tooltip over a condensed display name
function fillInEmailAddressTooltip(addressNode)
{
var emailAddress = addressNode.getTextAttribute('emailAddress');
var emailAddress = addressNode.getAttribute('emailAddress');
var tooltipNode = document.getElementById("attachmentListTooltip");
tooltipNode.setAttribute("label", attachmentName);
return true;

23
mozilla/mailnews/base/resources/content/mailWidgets.xml
View File

@ -887,29 +887,6 @@
return document.getAnonymousElementByAttribute(this, "anonid", aPartId);
]]></body>
</method>
<method name="setTextAttribute">
<parameter name="attributeName"/>
<parameter name="attributeValue"/>
<body><![CDATA[
this.setAttribute(attributeName, attributeValue);
this.getPart("emailImage").setAttribute(attributeName, attributeValue);
this.getPart("emailValue").setAttribute(attributeName, attributeValue);
]]></body>
</method>
<method name="getTextAttribute">
<parameter name="attributeName"/>
<body><![CDATA[
return this.getPart("emailValue").getAttribute(attributeName);
]]></body>
</method>
<method name="GetIconNode">
<body><![CDATA[
return this.getPart("emailImage");
]]></body>
</method>
</implementation>
</binding>

10
mozilla/mailnews/base/resources/content/msgHdrViewOverlay.js
View File

@ -53,7 +53,6 @@ var msgHeaderParserContractID = "@mozilla.org/messenger/headerparser;1";
var abAddressCollectorContractID = "@mozilla.org/addressbook/services/addressCollecter;1";
var gViewAllHeaders = false;
var gNumAddressesToShow = 3;
var gShowOrganization = false;
var gShowUserAgent = false;
var gCollectIncoming = false;
@ -230,7 +229,6 @@ function OnLoadMsgHeaderPane()
// load any preferences that at are global with regards to
// displaying a message...
gNumAddressesToShow = pref.getIntPref("mailnews.max_header_display_length");
gCollectIncoming = pref.getBoolPref("mail.collect_email_address_incoming");
gCollectNewsgroup = pref.getBoolPref("mail.collect_email_address_newsgroup");
gCollectOutgoing = pref.getBoolPref("mail.collect_email_address_outgoing");
@ -823,7 +821,7 @@ function OutputEmailAddresses(headerEntry, emailAddresses)
}
if (headerEntry.useToggle)
headerEntry.enclosingBox.buildViews(gNumAddressesToShow);
headerEntry.enclosingBox.buildViews();
} // if msgheader parser
}
@ -875,9 +873,9 @@ function updateEmailAddressNode(emailAddressNode, address)
{
emailAddressNode.setAttribute("label", address.fullAddress || address.displayName);
emailAddressNode.removeAttribute("tooltiptext");
emailAddressNode.setTextAttribute("emailAddress", address.emailAddress);
emailAddressNode.setTextAttribute("fullAddress", address.fullAddress);
emailAddressNode.setTextAttribute("displayName", address.displayName);
emailAddressNode.setAttribute("emailAddress", address.emailAddress);
emailAddressNode.setAttribute("fullAddress", address.fullAddress);
emailAddressNode.setAttribute("displayName", address.displayName);
if ("AddExtraAddressProcessing" in this)
AddExtraAddressProcessing(address.emailAddress, emailAddressNode);

2
mozilla/mailnews/mailnews.js
View File

@ -521,8 +521,6 @@ pref("mail.forward_message_mode", 0); // 0=default as attachment 2=forward as in
pref("mail.startup.enabledMailCheckOnce", false);
pref("mailnews.max_header_display_length",3); // number of addresses to show
pref("messenger.throbber.url","chrome://messenger-region/locale/region.properties");
pref("compose.throbber.url","chrome://messenger-region/locale/region.properties");
pref("addressbook.throbber.url","chrome://messenger-region/locale/region.properties");