Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug 35746. Replace prefilled recipients (reply-to, bcc) when switching identity. R=mscott

Browse Source
This commit is contained in:
ducarroz%netscape.com 2000-07-31 21:46:33 +00:00
parent e7c124aeec
commit 2b61e46f5f
2 changed files with 149 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
mailnews/compose/resources/content/MsgComposeCommands.js
View File

@ -39,6 +39,7 @@ var currentAttachment = null;
var documentLoaded = false;
var windowLocked = false;
var contentChanged = false;
var currentIdentity = null;
var Bundle = srGetStrBundle("chrome://messenger/locale/messengercompose/composeMsgs.properties");
@ -1175,16 +1176,67 @@ function LoadIdentity(startup)
{
var identityElement = document.getElementById("msgIdentity");
prevIdentity = currentIdentity;
if (identityElement) {
var item = identityElement.selectedItem;
idKey = item.getAttribute('id');
var identity = accountManager.getIdentity(idKey);
currentIdentity = accountManager.getIdentity(idKey);
if (!startup && prevIdentity && idKey != prevIdentity.key)
{
var prevReplyTo = prevIdentity.replyTo;
var prevBcc = "";
if (prevIdentity.bccSelf)
prevBcc += prevIdentity.email;
if (prevIdentity.bccOthers)
{
if (prevBcc != "")
prevBcc += ","
prevBcc += prevIdentity.bccList;
}
var newReplyTo = currentIdentity.replyTo;
var newBcc = "";
if (currentIdentity.bccSelf)
newBcc += currentIdentity.email;
if (currentIdentity.bccOthers)
{
if (newBcc != "")
newBcc += ","
newBcc += currentIdentity.bccList;
}
var needToCleanUp = false;
var msgCompFields = msgCompose.compFields;
if (newReplyTo != prevReplyTo)
{
needToCleanUp = true;
if (prevReplyTo != "")
awRemoveRecipients(msgCompFields, "addr_reply", prevReplyTo);
if (newReplyTo != "")
awAddRecipients(msgCompFields, "addr_reply", newReplyTo);
}
if (newBcc != prevBcc)
{
needToCleanUp = true;
if (prevBcc != "")
awRemoveRecipients(msgCompFields, "addr_bcc", prevBcc);
if (newReplyTo != "")
awAddRecipients(msgCompFields, "addr_bcc", newBcc);
}
if (needToCleanUp)
awCleanupRows();
}
//Setup autocomplete session, we can doit from here as it's use as a service
var session = Components.classes["component://netscape/autocompleteSession&type=addrbook"].getService(Components.interfaces.nsIAbAutoCompleteSession);
if (session)
{
var emailAddr = identity.email;
var emailAddr = currentIdentity.email;
var start = emailAddr.lastIndexOf("@");
session.defaultDomain = emailAddr.slice(start + 1, emailAddr.length);
}

110
mailnews/compose/resources/content/addressingWidgetOverlay.js
View File

@ -142,32 +142,38 @@ function CompFields2Recipients(msgCompFields, msgType)
}
}
function _awSetInputAndPopup(inputValue, popupValue, parentNode, templateNode)
function awSetInputAndPopupValue(inputElem, inputValue, popupElem, popupValue, rowNumber)
{
// remove leading spaces
while (inputValue[0] == " " )
inputValue = inputValue.substring(1, inputValue.length);
inputElem.setAttribute("value", inputValue);
inputElem.value = inputValue;
popupElem.selectedItem = popupElem.childNodes[0].childNodes[awGetSelectItemIndex(popupValue)];
if (rowNumber >= 0)
{
inputElem.setAttribute("id", "msgRecipient#" + rowNumber);
popupElem.setAttribute("id", "msgRecipientType#" + rowNumber);
}
_awDisableAutoComplete(popupElem, inputElem);
}
function _awSetInputAndPopup(inputValue, popupValue, parentNode, templateNode)
{
top.MAX_RECIPIENTS++;
var newNode = templateNode.cloneNode(true);
parentNode.appendChild(newNode); // we need to insert the new node before we set the value of the select element!
var input = newNode.getElementsByTagName(awInputElementName());
if ( input && input.length == 1 )
{
input[0].setAttribute("value", inputValue);
input[0].value = inputValue;
input[0].setAttribute("id", "msgRecipient#" + top.MAX_RECIPIENTS);
}
var select = newNode.getElementsByTagName(awSelectElementName());
if ( select && select.length == 1 )
{
select[0].selectedItem = select[0].childNodes[0].childNodes[awGetSelectItemIndex(popupValue)];
select[0].setAttribute("id", "msgRecipientType#" + top.MAX_RECIPIENTS);
if (input)
_awDisableAutoComplete(select[0], input[0]);
}
if (input && input.length == 1 && select && select.length == 1)
awSetInputAndPopupValue(input[0], inputValue, select[0], popupValue, top.MAX_RECIPIENTS)
}
function awSetInputAndPopup(inputValue, popupValue, parentNode, templateNode)
@ -190,6 +196,80 @@ function awSetInputAndPopupFromArray(inputArray, popupValue, parentNode, templat
}
}
function awRemoveRecipients(msgCompFields, recipientType, recipientsList)
{
if (!msgCompFields)
return;
var recipientArray = msgCompFields.SplitRecipients(recipientsList, false);
if (! recipientArray)
return;
for ( var index = 0; index < recipientArray.count; index++ )
for (var row = 1; row <= top.MAX_RECIPIENTS; row ++)
{
var popup = awGetPopupElement(row);
if (popup.selectedItem.getAttribute("data") == recipientType)
{
var input = awGetInputElement(row);
if (input.value == recipientArray.StringAt(index))
{
awSetInputAndPopupValue(input, "", popup, "addr_to", -1);
break;
}
}
}
}
function awAddRecipients(msgCompFields, recipientType, recipientsList)
{
if (!msgCompFields)
return;
var recipientArray = msgCompFields.SplitRecipients(recipientsList, false);
if (! recipientArray)
return;
for ( var index = 0; index < recipientArray.count; index++ )
{
for (var row = 1; row <= top.MAX_RECIPIENTS; row ++)
{
if (awGetInputElement(row).value == "")
break;
}
if (row > top.MAX_RECIPIENTS)
awAppendNewRow(false);
awSetInputAndPopupValue(awGetInputElement(row), recipientArray.StringAt(index), awGetPopupElement(row), recipientType, row);
/* be sure we still have an empty row left at the end */
if (row == top.MAX_RECIPIENTS)
{
awAppendNewRow(true);
awSetInputAndPopupValue(awGetInputElement(top.MAX_RECIPIENTS), "", awGetPopupElement(top.MAX_RECIPIENTS), "addr_to", top.MAX_RECIPIENTS);
}
}
}
function awCleanupRows()
{
var maxRecipients = top.MAX_RECIPIENTS;
var rowID = 1;
for (var row = 1; row <= maxRecipients; row ++)
{
var inputElem = awGetInputElement(row);
if (inputElem.value == "" && row < maxRecipients)
awRemoveRow(row);
else
{
inputElem.setAttribute("id", "msgRecipient#" + rowID);
awGetPopupElement(row).setAttribute("id", "msgRecipientType#" + rowID);
rowID ++;
}
}
}
function awNotAnEmptyArea(event)
{
//This is temporary until i figure out how to ensure to always having an empty space after the last row
@ -356,7 +436,7 @@ function awRemoveRow(row)
awRemoveNodeAndChildren(body, awGetTreeItem(row));
top.MAX_RECIPIENTS--;
top.MAX_RECIPIENTS --;
}
function awRemoveNodeAndChildren(parent, nodeToRemove)