mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 283729 Startup errors/warnings in JavaScript console (trunk) 

patch by hskupin@gmail.com r=mscott sr=mscott
This commit is contained in:
timeless%mozdev.org 2005-11-09 21:40:59 +00:00
Родитель 77cfb29e1a
Коммит 31274ba897
2 изменённых файлов: 7 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
mail/base/content/mailWindowOverlay.js
Просмотреть файл

@ -2136,8 +2136,9 @@ function HandleJunkStatusChanged(folder)
var sanitizeJunkMail = gPrefBranch.getBoolPref("mailnews.display.sanitizeJunkMail");
if (changedJunkStatus && sanitizeJunkMail) // only bother doing this if we are modifying the html for junk mail....
{
var folder = GetLoadedMsgFolder();
var moveJunkMail = (folder && folder.server && folder.server.spamSettings) ? folder.server.spamSettings.manualMark : false;
var loadedFolder = GetLoadedMsgFolder();
var moveJunkMail = (loadedFolder && loadedFolder.server && loadedFolder.server.spamSettings) ?
loadedFolder.server.spamSettings.manualMark : false;
var junkScore = msgHdr.getStringProperty("junkscore");
var isJunk = ((junkScore != "") && (junkScore != "0"));

8
mail/base/content/msgHdrViewOverlay.js
Просмотреть файл

@ -469,7 +469,7 @@ var messageHeaderSink = {
// display name optimization. Eliminate any large quantities of white space from the display name.
// such that Hello World.txt becomes Hello World.txt.
var displayName = displayName.replace(/ +/g, " ");
displayName = displayName.replace(/ +/g, " ");
currentAttachments.push (new createNewAttachmentInfo(contentType, url, displayName, uri, isExternalAttachment));
// if we have an attachment, set the MSG_FLAG_ATTACH flag on the hdr
@ -993,7 +993,7 @@ function updateEmailAddressNode(emailAddressNode, emailAddress, fullAddress, dis
function AddExtraAddressProcessing(emailAddress, addressNode)
{
var displayName = addressNode.getTextAttribute("displayName");
var emailAddress = addressNode.getTextAttribute("emailAddress");
var mailAddress = addressNode.getTextAttribute("emailAddress");
// always show the address for the from and reply-to fields
var parentElementId = addressNode.parentNode.id;
@ -1001,10 +1001,10 @@ function AddExtraAddressProcessing(emailAddress, addressNode)
if (parentElementId == "expandedfromBox" || parentElementId == "expandedreply-toBox")
condenseName = false;
if (condenseName && gShowCondensedEmailAddresses && displayName && useDisplayNameForAddress(emailAddress))
if (condenseName && gShowCondensedEmailAddresses && displayName && useDisplayNameForAddress(mailAddress))
{
addressNode.setAttribute('label', displayName);
addressNode.setAttribute("tooltiptext", emailAddress);
addressNode.setAttribute("tooltiptext", mailAddress);
addressNode.setAttribute("tooltip", "emailAddressTooltip");
}
else