Bug 1301093 - Part 1: don't wait for a result when we won't get one. r=adw
MozReview-Commit-ID: E6l9mW3ZoKp
This commit is contained in:
@@ -825,8 +825,9 @@ nsFormFillController::HandleEvent(nsIDOMEvent* aEvent)
|
||||
return KeyPress(aEvent);
|
||||
}
|
||||
if (type.EqualsLiteral("input")) {
|
||||
bool unused = false;
|
||||
return (!mSuppressOnInput && mController && mFocusedInput) ?
|
||||
mController->HandleText() : NS_OK;
|
||||
mController->HandleText(&unused) : NS_OK;
|
||||
}
|
||||
if (type.EqualsLiteral("blur")) {
|
||||
if (mFocusedInput)
|
||||
@@ -936,6 +937,7 @@ nsFormFillController::KeyPress(nsIDOMEvent* aEvent)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
bool cancel = false;
|
||||
bool unused = false;
|
||||
|
||||
uint32_t k;
|
||||
keyEvent->GetKeyCode(&k);
|
||||
@@ -945,7 +947,7 @@ nsFormFillController::KeyPress(nsIDOMEvent* aEvent)
|
||||
mController->HandleDelete(&cancel);
|
||||
break;
|
||||
case nsIDOMKeyEvent::DOM_VK_BACK_SPACE:
|
||||
mController->HandleText();
|
||||
mController->HandleText(&unused);
|
||||
break;
|
||||
#else
|
||||
case nsIDOMKeyEvent::DOM_VK_BACK_SPACE:
|
||||
@@ -953,10 +955,11 @@ nsFormFillController::KeyPress(nsIDOMEvent* aEvent)
|
||||
bool isShift = false;
|
||||
keyEvent->GetShiftKey(&isShift);
|
||||
|
||||
if (isShift)
|
||||
if (isShift) {
|
||||
mController->HandleDelete(&cancel);
|
||||
else
|
||||
mController->HandleText();
|
||||
} else {
|
||||
mController->HandleText(&unused);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
@@ -1066,7 +1069,8 @@ nsFormFillController::MouseDown(nsIDOMEvent* aEvent)
|
||||
if (value.Length() > 0) {
|
||||
// Show the popup with a filtered result set
|
||||
mController->SetSearchString(EmptyString());
|
||||
mController->HandleText();
|
||||
bool unused = false;
|
||||
mController->HandleText(&unused);
|
||||
} else {
|
||||
// Show the popup with the complete result set. Can't use HandleText()
|
||||
// because it doesn't display the popup if the input is blank.
|
||||
|
||||
Reference in New Issue
Block a user