Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

missing changes in nsHTMLEditor.cpp from bug 167712, solves minor problems in CSS mode of Composer, r=timeless, sr=kin

Browse Source
This commit is contained in:
glazman%netscape.com 2002-09-20 02:09:04 +00:00
parent d63003256b
commit 401191b960
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
editor/libeditor/html/nsHTMLEditor.cpp
View File

@ -5384,7 +5384,10 @@ nsHTMLEditor::SetAttributeOrEquivalent(nsIDOMElement * aElement,
res = GetAttributeValue(aElement, aAttribute, existingValue, &wasSet);
if (NS_FAILED(res)) return res;
if (wasSet) {
res = RemoveAttribute(aElement, aAttribute);
if (aSuppressTransaction)
res = aElement->RemoveAttribute(aAttribute);
else
res = RemoveAttribute(aElement, aAttribute);
}
}
else {
@ -5400,18 +5403,27 @@ nsHTMLEditor::SetAttributeOrEquivalent(nsIDOMElement * aElement,
if (NS_FAILED(res)) return res;
existingValue.Append(NS_LITERAL_STRING(" "));
existingValue.Append(aValue);
res = SetAttribute(aElement, aAttribute, existingValue);
if (aSuppressTransaction)
res = aElement->SetAttribute(aAttribute, existingValue);
else
res = SetAttribute(aElement, aAttribute, existingValue);
}
else {
// we have no CSS equivalence for this attribute and it is not the style
// attribute; let's set it the good'n'old HTML way
res = SetAttribute(aElement, aAttribute, aValue);
if (aSuppressTransaction)
res = aElement->SetAttribute(aAttribute, aValue);
else
res = SetAttribute(aElement, aAttribute, aValue);
}
}
}
else {
// we are not in an HTML+CSS editor; let's set the attribute the HTML way
res = SetAttribute(aElement, aAttribute, aValue);
if (aSuppressTransaction)
res = aElement->SetAttribute(aAttribute, aValue);
else
res = SetAttribute(aElement, aAttribute, aValue);
}
return res;
}
@ -5435,7 +5447,10 @@ nsHTMLEditor::RemoveAttributeOrEquivalent(nsIDOMElement * aElement,
res = GetAttributeValue(aElement, aAttribute, existingValue, &wasSet);
if (NS_FAILED(res)) return res;
if (wasSet) {
res = RemoveAttribute(aElement, aAttribute);
if (aSuppressTransaction)
res = aElement->RemoveAttribute(aAttribute);
else
res = RemoveAttribute(aElement, aAttribute);
}
return res;
}