зеркало из https://github.com/mozilla/gecko-dev.git
Bug 132108 Remove temporary patch for bug 26528 r=ducarroz sr=sspitzer
This commit is contained in:
Родитель
1dd5b9dab2
Коммит
2c76da39ca
|
@ -474,8 +474,6 @@ function _awSetFocus()
|
|||
try
|
||||
{
|
||||
var theNewRow = awGetListItem(top.awRow);
|
||||
//temporary patch for bug 26344
|
||||
// awFinishCopyNode(theNewRow);
|
||||
|
||||
listbox.ensureElementIsVisible(theNewRow);
|
||||
top.awInputElement.focus();
|
||||
|
@ -493,14 +491,6 @@ function _awSetFocus()
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
//temporary patch for bug 26344 & 26528
|
||||
function awFinishCopyNode(node)
|
||||
{
|
||||
msgCompose.ResetNodeEventHandlers(node);
|
||||
return;
|
||||
}
|
||||
|
||||
function awTabFromRecipient(element, event)
|
||||
{
|
||||
//If we are the last element in the listbox, we don't want to create a new row.
|
||||
|
|
|
@ -179,10 +179,6 @@ interface nsIMsgCompose : nsISupports {
|
|||
*/
|
||||
void SetSignature(in nsIMsgIdentity identity);
|
||||
|
||||
/* ResetNodeEventHandlers: Temporary API to go around bug 26528. THis API will be removed when bug 26528 is fixed.
|
||||
*/
|
||||
void ResetNodeEventHandlers(in nsIDOMNode node);
|
||||
|
||||
/* Check if the composing mail headers (and identity) can be converted to a mail charset.
|
||||
*/
|
||||
boolean checkCharsetConversion(in nsIMsgIdentity identity, out string fallbackCharset);
|
||||
|
|
|
@ -233,7 +233,6 @@ function CompFields2Recipients(msgCompFields, msgType)
|
|||
var parent = listbox.parentNode;
|
||||
parent.replaceChild(newListBoxNode, listbox);
|
||||
awFitDummyRows(2);
|
||||
setTimeout("awFinishCopyNodes();", 0);
|
||||
|
||||
gMimeHeaderParser = null; //Release the mime parser
|
||||
}
|
||||
|
@ -672,8 +671,6 @@ function _awSetFocus()
|
|||
//try
|
||||
//{
|
||||
var theNewRow = awGetListItem(top.awRow);
|
||||
//temporary patch for bug 26344
|
||||
awFinishCopyNode(theNewRow);
|
||||
|
||||
//Warning: firstVisibleRow is zero base but top.awRow is one base!
|
||||
var firstVisibleRow = listbox.getIndexOfFirstVisibleRow();
|
||||
|
@ -703,21 +700,6 @@ function _awSetFocus()
|
|||
}*/
|
||||
}
|
||||
|
||||
|
||||
//temporary patch for bug 26344 & 26528
|
||||
function awFinishCopyNode(node)
|
||||
{
|
||||
gMsgCompose.ResetNodeEventHandlers(node);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
function awFinishCopyNodes()
|
||||
{
|
||||
var listbox = document.getElementById('addressingWidget');
|
||||
awFinishCopyNode(listbox);
|
||||
}
|
||||
|
||||
function awTabFromRecipient(element, event)
|
||||
{
|
||||
//If we are le last element in the listbox, we don't want to create a new row.
|
||||
|
|
|
@ -4622,74 +4622,6 @@ nsresult nsMsgCompose::SetSignature(nsIMsgIdentity *identity)
|
|||
return rv;
|
||||
}
|
||||
|
||||
nsresult nsMsgCompose::ResetNodeEventHandlers(nsIDOMNode *node)
|
||||
{
|
||||
// Because event handler attributes set into a node before this node is inserted
|
||||
// into the DOM are not recognised (in fact not compiled), we need to parsed again
|
||||
// the whole node and reset event handlers.
|
||||
|
||||
nsresult rv;
|
||||
nsAutoString aStr;
|
||||
PRUint32 i;
|
||||
PRUint32 nbrOfElements;
|
||||
nsCOMPtr<nsIDOMNode> pItem;
|
||||
|
||||
if (nsnull == node)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
nsCOMPtr<nsIDOMNamedNodeMap> pAttributes;
|
||||
rv = node->GetAttributes(getter_AddRefs(pAttributes));
|
||||
if (NS_SUCCEEDED(rv) && pAttributes)
|
||||
{
|
||||
rv = pAttributes->GetLength(&nbrOfElements);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
for (i = 0; i < nbrOfElements; i ++)
|
||||
{
|
||||
rv = pAttributes->Item(i, getter_AddRefs(pItem));
|
||||
if (NS_SUCCEEDED(rv) && pItem)
|
||||
{
|
||||
rv = pItem->GetNodeName(aStr);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
if (aStr.Find("on", PR_FALSE, 0, 2) == 0) //name start with "on"
|
||||
{
|
||||
rv = pItem->GetNodeValue(aStr);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
rv = pItem->SetNodeValue(aStr);
|
||||
//Do not abort if it failed, let do the next one...
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
PRBool hasChild;
|
||||
rv = node->HasChildNodes(&hasChild);
|
||||
if (NS_SUCCEEDED(rv) && hasChild)
|
||||
{
|
||||
nsCOMPtr<nsIDOMNodeList> children;
|
||||
rv = node->GetChildNodes(getter_AddRefs(children));
|
||||
if (NS_SUCCEEDED(rv) && children)
|
||||
{
|
||||
rv = children->GetLength(&nbrOfElements);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
for (i = 0; i < nbrOfElements; i ++)
|
||||
{
|
||||
rv = children->Item(i, getter_AddRefs(pItem));
|
||||
if (NS_SUCCEEDED(rv) && pItem)
|
||||
ResetNodeEventHandlers(pItem);
|
||||
//Do not abort if it failed, let do the next one...
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsMsgCompose::CheckCharsetConversion(nsIMsgIdentity *identity, char **fallbackCharset, PRBool *_retval)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(identity);
|
||||
|
|
Загрузка…
Ссылка в новой задаче