opendev/gerrit
Code Issues Proposed changes

Fix unfocusable HintTextBox bug on Lucid FF 3.6.10

Browse Source 
Remove the previous ESC key workaround since it seems to
cause problems on some browsers.  Add a simpler workaround
which mimicks one which Shawn already used in the Search
textbox since we have not heard any complaints about that one,
and it is simpler and cleaner.  Remove this workaround from
the SearchBox since it will now be redundant.

Change-Id: I390261c5c4afaa883c02184775a333d1e4b9f0eb
This commit is contained in:
Martin Fick
2010-09-17 15:04:13 -06:00
parent e5669acc57
commit fef8433523
2 changed files with 68 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java
View File

@@ -46,14 +46,8 @@ class SearchPanel extends Composite {
searchBox.addKeyPressHandler(new KeyPressHandler() {
@Override
public void onKeyPress(final KeyPressEvent event) {
switch (event.getCharCode()) {
case KeyCodes.KEY_ENTER:
doSearch();
break;
case KeyCodes.KEY_ESCAPE:
searchBox.setText("");
searchBox.setFocus(false);
break;
if (event.getCharCode() == KeyCodes.KEY_ENTER) {
doSearch();
}
}
});

92
gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HintTextBox.java
View File

@@ -15,37 +15,33 @@
package com.google.gerrit.client.ui;
import com.google.gerrit.client.Gerrit;
import com.google.gwt.event.dom.client.BlurEvent;
import com.google.gwt.event.dom.client.BlurHandler;
import com.google.gwt.event.dom.client.FocusEvent;
import com.google.gwt.event.dom.client.FocusHandler;
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.event.dom.client.KeyDownEvent;
import com.google.gwt.event.dom.client.KeyDownHandler;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwtexpui.globalkey.client.NpTextBox;
import com.google.gwt.user.client.ui.SuggestBox;
import com.google.gwt.user.client.ui.Widget;
public class HintTextBox extends NpTextBox {
private HandlerRegistration hintFocusHandler;
private HandlerRegistration hintBlurHandler;
private HandlerRegistration keyDownHandler;
private String hintText;
private String hintStyleName = Gerrit.RESOURCES.css().inputFieldTypeHint();
private String prevText;
private boolean hintOn;
private boolean isFocused;
/*
* There seems to be a strange bug (at least on firefox 3.5.9 ubuntu) with
* the textbox under the following circumstances:
* 1) The field is not focused with BText in it.
* 2) The field receives focus and a focus listener changes the text to FText
* 3) The ESC key is pressed and the value of the field has not changed
* (ever) from FText
* 4) BUG: The text value gets reset to BText!
*
* To counter this bug, force all focus events to first force a blur event.
* For some reason, this seems to prevent the bug.
*/
private boolean bugStopping = false;
public String getText() {
if (hintOn) {
@@ -58,6 +54,7 @@ public class HintTextBox extends NpTextBox {
focusHint();
super.setText(text);
prevText = text;
if (! isFocused) {
blurHint();
@@ -79,6 +76,8 @@ public class HintTextBox extends NpTextBox {
hintFocusHandler = null;
hintBlurHandler.removeHandler();
hintBlurHandler = null;
keyDownHandler.removeHandler();
keyDownHandler = null;
hintText = null;
focusHint();
@@ -93,14 +92,37 @@ public class HintTextBox extends NpTextBox {
hintFocusHandler = addFocusHandler(new FocusHandler() {
@Override
public void onFocus(FocusEvent event) {
setFocus(true);
focusHint();
prevText = getText();
isFocused = true;
}
});
hintBlurHandler = addBlurHandler(new BlurHandler() {
@Override
public void onBlur(BlurEvent event) {
setFocus(false);
blurHint();
isFocused = false;
}
});
/*
* There seems to be a strange bug (at least on firefox 3.5.9 ubuntu) with
* the textbox under the following circumstances:
* 1) The field is not focused with BText in it.
* 2) The field receives focus and a focus listener changes the text to FText
* 3) The ESC key is pressed and the value of the field has not changed
* (ever) from FText
* 4) BUG: The text value gets reset to BText!
*
* A counter to this bug seems to be to force setFocus(false) on ESC.
*/
/* Chrome does not create a KeyPressEvent on ESC, so use KeyDownEvents */
keyDownHandler = addKeyDownHandler(new KeyDownHandler() {
@Override
public void onKeyDown(final KeyDownEvent event) {
onKey(event.getNativeKeyCode());
}
});
@@ -115,6 +137,28 @@ public class HintTextBox extends NpTextBox {
}
}
private void onKey(int key) {
if (key == KeyCodes.KEY_ESCAPE) {
setText(prevText);
Widget p = getParent();
if (p instanceof SuggestBox) {
// Since the text was changed, ensure that the SuggestBox is
// aware of this change so that it will refresh properly on
// the next keystroke. Without this, if the first keystroke
// recreates the same string as before ESC was pressed, the
// SuggestBox will think that the string has not changed, and
// it will not yet provide any Suggestions.
((SuggestBox)p).showSuggestionList();
// The suggestion list lingers if we don't hide it.
((SuggestBox)p).hideSuggestionList();
}
setFocus(false);
}
}
public void setHintStyleName(String styleName) {
if (hintStyleName != null && hintOn) {
removeStyleName(hintStyleName);
@@ -152,18 +196,14 @@ public class HintTextBox extends NpTextBox {
}
public void setFocus(boolean focus) {
if (focus) {
bugStopping = true;
super.setFocus(!focus);
bugStopping = false;
}
super.setFocus(focus);
if (focus) {
focusHint();
} else if (!bugStopping) {
blurHint();
if (focus != isFocused) {
if (focus) {
focusHint();
} else {
blurHint();
}
}
isFocused = focus;