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

Fix for bug #91310 (Align Right splits table) and

Browse Source 
bug #91288 (Aligning blank table cell in show all tags mode splits table)

Modified WillAlign to prevent unnecessary splitting:

  - Don't execute emptyDiv special case code when start container of the
    selection is a table cell element, but not a table cell or caption.
  - Prevent processing of whitespace between list/table structure nodes.
  - Prevent splitting when processing sub lists.

r=brade@netscape.com  sr=attinasi@netscape.com


git-svn-id: svn://10.0.0.236/trunk@99847 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kin%netscape.com
2001-07-25 00:10:34 +00:00
parent 86860cc82d
commit 19e4169a0a
2 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mozilla/editor/base/nsHTMLEditRules.cpp
View File

@@ -3134,7 +3134,25 @@ nsHTMLEditRules::WillAlign(nsISelection *aSelection,
nsCOMPtr<nsIDOMNode> theNode( do_QueryInterface(isupports ) );
if (nsTextEditUtils::IsBreak(theNode))
{
emptyDiv = PR_TRUE;
// The special case emptyDiv code (below) that consumes BRs can
// cause tables to split if the start node of the selection is
// not in a table cell or caption, for example parent is a <tr>.
// Avoid this unnecessary splitting if possible by leaving emptyDiv
// FALSE so that we fall through to the normal case alignment code.
//
// XXX: It seems a little error prone for the emptyDiv special
// case code to assume that the start node of the selection
// is the parent of the single node in the arrayOfNodes, as
// the paragraph above points out. Do we rely on the selection
// start node because of the fact that arrayOfNodes can be empty?
// We should probably revisit this issue. - kin
nsCOMPtr<nsIDOMNode> parent;
PRInt32 offset;
res = mHTMLEditor->GetStartNodeAndOffset(aSelection, address_of(parent), &offset);
if (!nsHTMLEditUtils::IsTableElement(parent) || nsHTMLEditUtils::IsTableCellOrCaption(parent))
emptyDiv = PR_TRUE;
}
}
if (emptyDiv)
@@ -3215,10 +3233,19 @@ nsHTMLEditRules::WillAlign(nsISelection *aSelection,
continue;
}
// if it's a table element (but not a table) or a list item, forget any "current" div, and
// instead put divs inside the appropriate block (td, li, etc)
// Skip insignificant formatting text nodes to prevent
// unnecessary structure splitting!
if (nsEditor::IsTextNode(curNode) &&
((nsHTMLEditUtils::IsTableElement(curParent) && !nsHTMLEditUtils::IsTableCellOrCaption(curParent)) ||
nsHTMLEditUtils::IsList(curParent)))
continue;
// if it's a table element (but not a table) or a list item, or a list
// inside a list, forget any "current" div, and instead put divs inside
// the appropriate block (td, li, etc)
if ( (nsHTMLEditUtils::IsTableElement(curNode) && !nsHTMLEditUtils::IsTable(curNode))
|| nsHTMLEditUtils::IsListItem(curNode) )
|| nsHTMLEditUtils::IsListItem(curNode)
|| (nsHTMLEditUtils::IsList(curNode) && nsHTMLEditUtils::IsList(curParent)))
{
res = AlignInnerBlocks(curNode, alignType);
if (NS_FAILED(res)) return res;

35
mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
View File

@@ -3134,7 +3134,25 @@ nsHTMLEditRules::WillAlign(nsISelection *aSelection,
nsCOMPtr<nsIDOMNode> theNode( do_QueryInterface(isupports ) );
if (nsTextEditUtils::IsBreak(theNode))
{
emptyDiv = PR_TRUE;
// The special case emptyDiv code (below) that consumes BRs can
// cause tables to split if the start node of the selection is
// not in a table cell or caption, for example parent is a <tr>.
// Avoid this unnecessary splitting if possible by leaving emptyDiv
// FALSE so that we fall through to the normal case alignment code.
//
// XXX: It seems a little error prone for the emptyDiv special
// case code to assume that the start node of the selection
// is the parent of the single node in the arrayOfNodes, as
// the paragraph above points out. Do we rely on the selection
// start node because of the fact that arrayOfNodes can be empty?
// We should probably revisit this issue. - kin
nsCOMPtr<nsIDOMNode> parent;
PRInt32 offset;
res = mHTMLEditor->GetStartNodeAndOffset(aSelection, address_of(parent), &offset);
if (!nsHTMLEditUtils::IsTableElement(parent) || nsHTMLEditUtils::IsTableCellOrCaption(parent))
emptyDiv = PR_TRUE;
}
}
if (emptyDiv)
@@ -3215,10 +3233,19 @@ nsHTMLEditRules::WillAlign(nsISelection *aSelection,
continue;
}
// if it's a table element (but not a table) or a list item, forget any "current" div, and
// instead put divs inside the appropriate block (td, li, etc)
// Skip insignificant formatting text nodes to prevent
// unnecessary structure splitting!
if (nsEditor::IsTextNode(curNode) &&
((nsHTMLEditUtils::IsTableElement(curParent) && !nsHTMLEditUtils::IsTableCellOrCaption(curParent)) ||
nsHTMLEditUtils::IsList(curParent)))
continue;
// if it's a table element (but not a table) or a list item, or a list
// inside a list, forget any "current" div, and instead put divs inside
// the appropriate block (td, li, etc)
if ( (nsHTMLEditUtils::IsTableElement(curNode) && !nsHTMLEditUtils::IsTable(curNode))
|| nsHTMLEditUtils::IsListItem(curNode) )
|| nsHTMLEditUtils::IsListItem(curNode)
|| (nsHTMLEditUtils::IsList(curNode) && nsHTMLEditUtils::IsList(curParent)))
{
res = AlignInnerBlocks(curNode, alignType);
if (NS_FAILED(res)) return res;