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

[CSS] Composer should be able to unbold/unitalicize invalid markup; b=119447, r=jfrancis, sr=kin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@112170 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
glazman%netscape.com 2002-01-15 14:44:00 +00:00
parent 3957b4457e
commit 3db2c2bdfb
3 changed files with 82 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/editor/libeditor/html/nsHTMLCSSUtils.cpp
View File

@ -74,6 +74,24 @@ void ProcessBValue(nsAReadableString * aInputString, nsAWritableString & aOutput
}
}
static
void ProcessIValue(nsAReadableString * aInputString, nsAWritableString & aOutputString,
const char * aDefaultValueString,
const char * aPrependString, const char* aAppendString)
{
if (aInputString) {
if (aInputString->Equals(NS_LITERAL_STRING("-moz-editor-invert-value"))) {
aOutputString.Assign(NS_LITERAL_STRING("normal"));
}
else {
aOutputString.Assign(NS_LITERAL_STRING("italic"));
}
}
else {
aOutputString.Assign(NS_LITERAL_STRING("italic"));
}
}
static
void ProcessDefaultValue(nsAReadableString * aInputString, nsAWritableString & aOutputString,
const char * aDefaultValueString,
@ -205,7 +223,7 @@ const nsHTMLCSSUtils::CSSEquivTable boldEquivTable[] = {
};
const nsHTMLCSSUtils::CSSEquivTable italicEquivTable[] = {
{ nsHTMLCSSUtils::eCSSEditableProperty_font_style, ProcessDefaultValue, "italic", nsnull, nsnull, PR_TRUE },
{ nsHTMLCSSUtils::eCSSEditableProperty_font_style, ProcessIValue, nsnull, nsnull, nsnull, PR_TRUE },
{ nsHTMLCSSUtils::eCSSEditableProperty_NONE, 0 }
};
@ -643,7 +661,8 @@ nsHTMLCSSUtils::RemoveCSSInlineStyle(nsIDOMNode *aNode, nsIAtom *aProperty, nsAR
PRBool
nsHTMLCSSUtils::IsCSSInvertable(nsIAtom *aProperty, const nsAReadableString *aAttribute)
{
return PRBool(nsIEditProperty::b == aProperty);
return PRBool(nsIEditProperty::b == aProperty
|| nsIEditProperty::i == aProperty);
}
// Get the default browser background color if we need it for GetCSSBackgroundColorState

2
mozilla/editor/libeditor/html/nsHTMLEditor.h
View File

@ -719,6 +719,8 @@ protected:
PRBool *aAll,
nsAWritableString *outValue);
nsresult RemoveElementIfUselessSpan(nsIDOMElement * aElement);
// Data members
protected:

77
mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp
View File

@ -334,7 +334,11 @@ nsHTMLEditor::SetInlinePropertyOnTextNode( nsIDOMCharacterData *aTextNode,
PRBool bHasProp;
nsCOMPtr<nsIDOMNode> styleNode;
IsTextPropertySetByContent(node, aProperty, aAttribute, aValue, bHasProp, getter_AddRefs(styleNode));
if (bHasProp) return NS_OK;
if (bHasProp &&
!(aValue && aValue->Equals(NS_LITERAL_STRING("-moz-editor-invert-value"))))
{
return NS_OK;
}
// do we need to split the text node?
PRUint32 textLen;
@ -420,10 +424,32 @@ nsHTMLEditor::SetInlinePropertyOnNode( nsIDOMNode *aNode,
// children of the aNode
res = RemoveStyleInside(tmp, aProperty, aAttribute, PR_TRUE);
if (NS_FAILED(res)) return res;
PRInt32 count;
// then we add the css styles corresponding to the HTML style request
res = mHTMLCSSUtils->SetCSSEquivalentToHTMLStyle(element, aProperty, aAttribute, aValue, &count);
nsCOMPtr<nsIDOMNode> parentNode;
res = tmp->GetParentNode(getter_AddRefs(parentNode));
if (NS_FAILED(res)) return res;
PRBool isSet = PR_FALSE;
if (parentNode) {
// let's check if the parent element already has the style we want
nsAutoString parentValue;
mHTMLCSSUtils->IsCSSEquivalentToHTMLInlineStyleSet(parentNode, aProperty, aAttribute,
isSet, parentValue,
COMPUTED_STYLE_TYPE);
}
if (isSet && !(aValue && aValue->Equals(NS_LITERAL_STRING("-moz-editor-invert-value")))) {
// the parent has the style we want to apply and we are not trying to remove this style
// from the selection
res = mHTMLCSSUtils->RemoveCSSEquivalentToHTMLStyle(element,
aProperty,
aAttribute,
aValue);
if (NS_FAILED(res)) return res;
res = RemoveElementIfUselessSpan(element);
}
else {
PRInt32 count;
// add the css styles corresponding to the HTML style request
res = mHTMLCSSUtils->SetCSSEquivalentToHTMLStyle(element, aProperty, aAttribute, aValue, &count);
}
return res;
}
}
@ -695,21 +721,9 @@ nsresult nsHTMLEditor::RemoveStyleInside(nsIDOMNode *aNode,
aProperty,
aAttribute,
&propertyValue);
// remove the node if it is a span, if its style attribute is empty or absent,
// and if it does not have a class nor an id
nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(aNode);
nsAutoString styleVal;
PRBool isStyleSet;
res = GetAttributeValue(elem, NS_LITERAL_STRING("style"), styleVal, &isStyleSet);
nsCOMPtr<nsIDOMElement> element = do_QueryInterface(aNode);
res = RemoveElementIfUselessSpan(element);
if (NS_FAILED(res)) return res;
if (NodeIsType(aNode, nsIEditProperty::span) && (!isStyleSet || (0 == styleVal.Length()))) {
PRBool hasClassOrId ;
res = mHTMLCSSUtils->HasClassOrID(elem, hasClassOrId);
if (!hasClassOrId) {
res = RemoveContainer(aNode);
if (NS_FAILED(res)) return res;
}
}
}
}
}
@ -1822,3 +1836,30 @@ nsHTMLEditor::IsCSSEnabled(PRBool *aIsSet)
return NS_OK;
}
nsresult
nsHTMLEditor::RemoveElementIfUselessSpan(nsIDOMElement * aElement)
{
NS_ENSURE_TRUE(aElement, NS_ERROR_NULL_POINTER);
nsCOMPtr<nsIDOMNode> node = do_QueryInterface(aElement);
// early way out if node is not a span element
if (!NodeIsType(node, nsIEditProperty::span)) {
return NS_OK;
}
// remove the node if it is a span, if its style attribute is empty or absent,
// and if it does not have a class nor an id
nsAutoString styleVal;
PRBool isStyleSet;
nsresult res = GetAttributeValue(aElement, NS_LITERAL_STRING("style"), styleVal, &isStyleSet);
if (NS_FAILED(res)) return res;
if (!isStyleSet || (0 == styleVal.Length())) {
PRBool hasClassOrId ;
res = mHTMLCSSUtils->HasClassOrID(aElement, hasClassOrId);
if (NS_FAILED(res)) return res;
if (!hasClassOrId) {
res = RemoveContainer(node);
}
}
return res;
}