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

fixes bug 98573: style feedback incorrect after a <br>; r=fm; sr=kin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@103604 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jfrancis%netscape.com 2001-09-24 03:40:23 +00:00
parent db8ca33a33
commit 636b0444f5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/editor/base/nsHTMLEditorStyle.cpp
View File

@ -851,10 +851,10 @@ nsHTMLEditor::GetInlinePropertyBase(nsIAtom *aProperty,
// this cache after certain actions.
range->GetStartContainer(getter_AddRefs(collapsedNode));
if (!collapsedNode) return NS_ERROR_FAILURE;
// refresh the cache if we need to
/* // refresh the cache if we need to
if (collapsedNode != mCachedNode) CacheInlineStyles(collapsedNode);
// cache now current, use it! But override it with typeInState results if any...
PRBool isSet, theSetting;
*/ PRBool isSet, theSetting;
if (aAttribute)
{
nsString tString(*aAttribute); //MJUDGE SCC NEED HELP
@ -873,6 +873,10 @@ nsHTMLEditor::GetInlinePropertyBase(nsIAtom *aProperty,
*aFirst = *aAny = *aAll = theSetting;
return NS_OK;
}
nsCOMPtr<nsIDOMNode> resultNode;
IsTextPropertySetByContent(collapsedNode, aProperty, 0, 0, isSet, getter_AddRefs(resultNode));
*aFirst = *aAny = *aAll = isSet;
return NS_OK;
/*
if (aProperty == mBoldAtom.get())
{

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

@ -851,10 +851,10 @@ nsHTMLEditor::GetInlinePropertyBase(nsIAtom *aProperty,
// this cache after certain actions.
range->GetStartContainer(getter_AddRefs(collapsedNode));
if (!collapsedNode) return NS_ERROR_FAILURE;
// refresh the cache if we need to
/* // refresh the cache if we need to
if (collapsedNode != mCachedNode) CacheInlineStyles(collapsedNode);
// cache now current, use it! But override it with typeInState results if any...
PRBool isSet, theSetting;
*/ PRBool isSet, theSetting;
if (aAttribute)
{
nsString tString(*aAttribute); //MJUDGE SCC NEED HELP
@ -873,6 +873,10 @@ nsHTMLEditor::GetInlinePropertyBase(nsIAtom *aProperty,
*aFirst = *aAny = *aAll = theSetting;
return NS_OK;
}
nsCOMPtr<nsIDOMNode> resultNode;
IsTextPropertySetByContent(collapsedNode, aProperty, 0, 0, isSet, getter_AddRefs(resultNode));
*aFirst = *aAny = *aAll = isSet;
return NS_OK;
/*
if (aProperty == mBoldAtom.get())
{