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

Fix shift-tabbing in the case where the first focusable element in the page has a non-text child node. Bug 136495, r=aaronl, sr=jst.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@120056 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%netscape.com 2002-04-27 01:20:48 +00:00
parent a691ceaa11
commit 5d3bd9ef31
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
mozilla/content/events/src/nsEventStateManager.cpp
View File

@ -4206,44 +4206,50 @@ nsresult nsEventStateManager::GetDocSelectionLocation(nsIContent **aStartContent
// If so, the caret is actually sitting in front of the next
// logical frame's primary node - so for this case we need to
// change caretContent to that node.
nsCOMPtr<nsIContent> origStartContent(startContent), rootContent;
mDocument->GetRootContent(getter_AddRefs(rootContent));
nsAutoString nodeValue;
nsCOMPtr<nsIDOMNode> domNode(do_QueryInterface(startContent));
domNode->GetNodeValue(nodeValue);
PRUint16 nodeType;
domNode->GetNodeType(&nodeType);
nsCOMPtr<nsIFormControl> formControl(do_QueryInterface(startContent));
if (nodeType == nsIDOMNode::TEXT_NODE) {
nsCOMPtr<nsIContent> origStartContent(startContent), rootContent;
mDocument->GetRootContent(getter_AddRefs(rootContent));
nsAutoString nodeValue;
domNode->GetNodeValue(nodeValue);
if (nodeValue.Length() == *aStartOffset && !formControl && startContent != rootContent) {
// Yes, indeed we were at the end of the last node
nsCOMPtr<nsIBidirectionalEnumerator> frameTraversal;
nsCOMPtr<nsIFormControl> formControl(do_QueryInterface(startContent));
nsCOMPtr<nsIFrameTraversal> trav(do_CreateInstance(kFrameTraversalCID,
&rv));
NS_ENSURE_SUCCESS(rv, rv);
if (nodeValue.Length() == *aStartOffset && !formControl && startContent != rootContent) {
// Yes, indeed we were at the end of the last node
nsCOMPtr<nsIBidirectionalEnumerator> frameTraversal;
rv = trav->NewFrameTraversal(getter_AddRefs(frameTraversal), LEAF,
mPresContext, startFrame);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIFrameTraversal> trav(do_CreateInstance(kFrameTraversalCID,
&rv));
NS_ENSURE_SUCCESS(rv, rv);
do {
// Get the next logical frame, and set the start of
// focusable elements. Search for focusable elements from there.
// Continue getting next frame until the primary node for the frame
// we are on changes - we don't want to be stuck in the same place
frameTraversal->Next();
nsISupports* currentItem;
frameTraversal->CurrentItem(&currentItem);
startFrame = NS_STATIC_CAST(nsIFrame*, currentItem);
if (startFrame) {
PRBool endEqualsStart(startContent == endContent);
startFrame->GetContent(getter_AddRefs(startContent));
if (endEqualsStart)
endContent = startContent;
rv = trav->NewFrameTraversal(getter_AddRefs(frameTraversal), LEAF,
mPresContext, startFrame);
NS_ENSURE_SUCCESS(rv, rv);
do {
// Get the next logical frame, and set the start of
// focusable elements. Search for focusable elements from there.
// Continue getting next frame until the primary node for the frame
// we are on changes - we don't want to be stuck in the same place
frameTraversal->Next();
nsISupports* currentItem;
frameTraversal->CurrentItem(&currentItem);
startFrame = NS_STATIC_CAST(nsIFrame*, currentItem);
if (startFrame) {
PRBool endEqualsStart(startContent == endContent);
startFrame->GetContent(getter_AddRefs(startContent));
if (endEqualsStart)
endContent = startContent;
}
else break;
}
else break;
while (startContent == origStartContent);
}
while (startContent == origStartContent);
}
}
}