fix bug 14624 (don't handle tab key twice). r=kin@netscape.com.

This commit is contained in:
brade%netscape.com 1999-11-16 14:41:03 +00:00
Родитель f20a013f2a
Коммит 2b99cca805
2 изменённых файлов: 0 добавлений и 60 удалений

Просмотреть файл

@ -127,28 +127,6 @@ nsTextEditorKeyListener::HandleEvent(nsIDOMEvent* aEvent)
nsresult nsresult
nsTextEditorKeyListener::KeyDown(nsIDOMEvent* aKeyEvent) nsTextEditorKeyListener::KeyDown(nsIDOMEvent* aKeyEvent)
{ {
PRUint32 keyCode;
nsCOMPtr<nsIDOMKeyEvent>keyEvent;
keyEvent = do_QueryInterface(aKeyEvent);
if (keyEvent)
{
if (NS_SUCCEEDED(keyEvent->GetKeyCode(&keyCode)))
{
if (nsIDOMKeyEvent::DOM_VK_TAB==keyCode)
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
PRUint32 flags=0;
mEditor->GetFlags(&flags);
if ((flags & nsIHTMLEditor::eEditorSingleLineMask))
return NS_OK; // let it be used for focus switching
// else we insert the tab straight through
htmlEditor->EditorKeyPress(keyEvent);
ScrollSelectionIntoView();
return NS_ERROR_BASE; // "I handled the event, don't do default processing"
}
}
}
return NS_OK; return NS_OK;
} }
@ -235,14 +213,6 @@ nsTextEditorKeyListener::KeyPress(nsIDOMEvent* aKeyEvent)
} }
} }
#if 0
// XXX: this must change. DOM_VK_tab must be handled here, not in keyDown
if (nsIDOMKeyEvent::DOM_VK_TAB==keyCode)
{
return NS_OK; // ignore tabs here, they're handled in keyDown if at all
}
#endif
htmlEditor->EditorKeyPress(keyEvent); htmlEditor->EditorKeyPress(keyEvent);
ScrollSelectionIntoView(); ScrollSelectionIntoView();
} }

Просмотреть файл

@ -127,28 +127,6 @@ nsTextEditorKeyListener::HandleEvent(nsIDOMEvent* aEvent)
nsresult nsresult
nsTextEditorKeyListener::KeyDown(nsIDOMEvent* aKeyEvent) nsTextEditorKeyListener::KeyDown(nsIDOMEvent* aKeyEvent)
{ {
PRUint32 keyCode;
nsCOMPtr<nsIDOMKeyEvent>keyEvent;
keyEvent = do_QueryInterface(aKeyEvent);
if (keyEvent)
{
if (NS_SUCCEEDED(keyEvent->GetKeyCode(&keyCode)))
{
if (nsIDOMKeyEvent::DOM_VK_TAB==keyCode)
{
nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
PRUint32 flags=0;
mEditor->GetFlags(&flags);
if ((flags & nsIHTMLEditor::eEditorSingleLineMask))
return NS_OK; // let it be used for focus switching
// else we insert the tab straight through
htmlEditor->EditorKeyPress(keyEvent);
ScrollSelectionIntoView();
return NS_ERROR_BASE; // "I handled the event, don't do default processing"
}
}
}
return NS_OK; return NS_OK;
} }
@ -235,14 +213,6 @@ nsTextEditorKeyListener::KeyPress(nsIDOMEvent* aKeyEvent)
} }
} }
#if 0
// XXX: this must change. DOM_VK_tab must be handled here, not in keyDown
if (nsIDOMKeyEvent::DOM_VK_TAB==keyCode)
{
return NS_OK; // ignore tabs here, they're handled in keyDown if at all
}
#endif
htmlEditor->EditorKeyPress(keyEvent); htmlEditor->EditorKeyPress(keyEvent);
ScrollSelectionIntoView(); ScrollSelectionIntoView();
} }