Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 08:12:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing delete key regression. r=hyatt

Browse Source
This commit is contained in:
saari%netscape.com 2000-02-12 05:52:24 +00:00
parent 867342cb82
commit 5ee75e51de
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rdf/content/src/nsXULKeyListener.cpp
View File

@ -1328,17 +1328,15 @@ nsXULKeyListenerImpl::HandleEventUsingKeyset(nsIDOMElement* aKeysetElement, nsID
aKeyEvent->GetCharCode(&theChar);
}
//printf("Found key [%s] \n", keyName.ToNewCString()); // this leaks
nsAutoString code; // either keycode or charcode
PRBool gotCharCode = PR_FALSE;
PRBool gotKeyCode = PR_FALSE;
if ( keyName.IsEmpty() )
{
keyElement->GetAttribute(nsAutoString("charcode"), code);
if(code.IsEmpty()) {
keyElement->GetAttribute(nsAutoString("keycode"), code);
if(code.IsEmpty()) {
keyElement->GetAttribute(nsAutoString("charcode"), keyName);
if(keyName.IsEmpty()) {
keyElement->GetAttribute(nsAutoString("keycode"), keyName);
if(keyName.IsEmpty()) {
// HACK for temporary compatibility
if(aEventType == eKeyPress)
aKeyEvent->GetCharCode(&theChar);
@ -1357,6 +1355,9 @@ nsXULKeyListenerImpl::HandleEventUsingKeyset(nsIDOMElement* aKeysetElement, nsID
}
}
if(keyName.IsEmpty())
break;
char tempChar[2];
tempChar[0] = theChar;
tempChar[1] = 0;
@ -1368,9 +1369,9 @@ nsXULKeyListenerImpl::HandleEventUsingKeyset(nsIDOMElement* aKeysetElement, nsID
PRBool isMatching;
if(gotCharCode){
isMatching = IsMatchingCharCode(tempChar2, code);
isMatching = IsMatchingCharCode(tempChar2, keyName);
} else if(gotKeyCode){
isMatching = IsMatchingKeyCode(theChar, code);
isMatching = IsMatchingKeyCode(theChar, keyName);
}
// HACK for backward compatibility