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

When using snav in a text elem, make sure that you can move the carot around in that text

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@221303 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%meer.net
2007-03-05 06:45:21 +00:00
parent 9282b6898f
commit b64d59461e
2 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
mozilla/extensions/spatialnavigation/src/nsSpatialNavigation.cpp
View File

@@ -136,7 +136,7 @@ nsSpatialNavigation::KeyDown(nsIDOMEvent* aEvent)
}
}
}
else if (!mService->mIgnoreTextFields && targetContent->IsNodeOfType(nsINode::eHTML))
else if (mService->mIgnoreTextFields && targetContent->IsNodeOfType(nsINode::eHTML))
{
// Test for isindex, a deprecated kind of text field. We're using a string
// compare because <isindex> is not considered a form control, so it does
@@ -195,14 +195,71 @@ nsSpatialNavigation::KeyDown(nsIDOMEvent* aEvent)
if (keyCode == mService->mKeyCodeLeft)
{
// ************************************************************************************
// NS_FORM_TEXTAREA cases:
// ************************************************************************************
// NS_FORM_INPUT_TEXT | NS_FORM_INPUT_PASSWORD | NS_FORM_INPUT_FILE cases
if (formControlType == NS_FORM_INPUT_TEXT ||
formControlType == NS_FORM_INPUT_PASSWORD)
{
PRInt32 selectionStart, textLength;
nsCOMPtr<nsIDOMNSHTMLInputElement> input = do_QueryInterface(targetContent);
if (input) {
input->GetSelectionStart (&selectionStart);
input->GetTextLength (&textLength);
} else {
nsCOMPtr<nsIDOMNSHTMLTextAreaElement> textArea = do_QueryInterface(targetContent);
if (textArea) {
textArea->GetSelectionStart (&selectionStart);
textArea->GetTextLength (&textLength);
}
}
if (textLength != 0 && selectionStart != 0)
return NS_OK;
}
// We're using this key, no one else should
aEvent->StopPropagation();
aEvent->PreventDefault();
return Left();
}
if (keyCode == mService->mKeyCodeRight)
{
// ************************************************************************************
// NS_FORM_TEXTAREA cases:
// ************************************************************************************
// NS_FORM_INPUT_TEXT | NS_FORM_INPUT_PASSWORD | NS_FORM_INPUT_FILE cases
if (formControlType == NS_FORM_INPUT_TEXT ||
formControlType == NS_FORM_INPUT_PASSWORD)
{
PRInt32 selectionEnd, textLength;
nsCOMPtr<nsIDOMNSHTMLInputElement> input = do_QueryInterface(targetContent);
if (input) {
input->GetSelectionEnd (&selectionEnd);
input->GetTextLength (&textLength);
} else {
nsCOMPtr<nsIDOMNSHTMLTextAreaElement> textArea = do_QueryInterface(targetContent);
if (textArea) {
textArea->GetSelectionEnd (&selectionEnd);
textArea->GetTextLength (&textLength);
}
}
// going down.
if (textLength != selectionEnd)
return NS_OK;
}
aEvent->StopPropagation();
aEvent->PreventDefault();
return Right();
@@ -227,12 +284,6 @@ nsSpatialNavigation::KeyDown(nsIDOMEvent* aEvent)
// if (formControlType == NS_FORM_SELECT)
// return NS_OK;
// ************************************************************************************
// NS_FORM_TEXTAREA cases:
// ************************************************************************************
// NS_FORM_INPUT_TEXT | NS_FORM_INPUT_PASSWORD | NS_FORM_INPUT_FILE cases
aEvent->StopPropagation();
aEvent->PreventDefault();
return Up();
@@ -256,12 +307,6 @@ nsSpatialNavigation::KeyDown(nsIDOMEvent* aEvent)
// if (formControlType == NS_FORM_SELECT)
// return NS_OK;
// ************************************************************************************
// NS_FORM_TEXTAREA cases:
// ************************************************************************************
// NS_FORM_INPUT_TEXT | NS_FORM_INPUT_PASSWORD | NS_FORM_INPUT_FILE cases
aEvent->StopPropagation(); // We're using this key, no one else should
aEvent->PreventDefault();
return Down();