test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-05 04:38:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refs #1631 Fix clearing value in VSearchSelect

Browse Source
This commit is contained in:
Yuriy Artamonov 2012-11-15 15:08:53 +00:00
parent c1971bf6a9
commit aa7156ab5f
1 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
modules/web-toolkit/src/com/vaadin/terminal/gwt/client/ui/VSearchSelect.java
View File

@ -9,6 +9,9 @@ package com.vaadin.terminal.gwt.client.ui;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.event.dom.client.*;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Event;
import com.vaadin.terminal.gwt.client.ApplicationConnection;
import com.vaadin.terminal.gwt.client.UIDL;
import com.vaadin.terminal.gwt.client.VConsole;
/**
@ -25,6 +28,8 @@ public class VSearchSelect extends VFilterSelect {
private boolean preventFilterAfterSelect = false;
private boolean keyboardNavigation = false;
public VSearchSelect() {
}
@ -69,6 +74,21 @@ public class VSearchSelect extends VFilterSelect {
return false;
}
@Override
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
super.updateFromUIDL(uidl, client);
if (currentSuggestion != null) {
debug("SEARCH| Current: '" + currentSuggestion.getReplacementString() + "'");
} else
debug("SEARCH| Cast!");
if (selectedOptionKey == null)
currentSuggestion = null;
updateEditState();
}
@Override
protected void applyNewSuggestions() {
debug("SEARCH| Matches: " + totalMatches);
@ -82,13 +102,15 @@ public class VSearchSelect extends VFilterSelect {
if (!("".equals(lastFilter))) {
debug("SEARCH| show currentSuggestions=" + currentSuggestions.size() + " page: " + currentPage);
suggestionPopup.showSuggestions(currentSuggestions, currentPage, totalMatches);
suggestionPopup.menu.selectItem(null);
Scheduler.get().scheduleDeferred(new Scheduler.ScheduledCommand() {
@Override
public void execute() {
suggestionPopup.selectNextItem();
}
});
if (!keyboardNavigation) {
suggestionPopup.menu.selectItem(null);
Scheduler.get().scheduleDeferred(new Scheduler.ScheduledCommand() {
@Override
public void execute() {
suggestionPopup.selectNextItem();
}
});
}
} else if (nullSelectionAllowed) {
suggestionPopup.menu.doSelectedItemAction();
}
@ -96,6 +118,8 @@ public class VSearchSelect extends VFilterSelect {
suggestionPopup.hide();
}
keyboardNavigation = false;
updateEditState();
}
@ -142,10 +166,14 @@ public class VSearchSelect extends VFilterSelect {
removeStyleDependentName(INPUT_STATE);
} else
addStyleDependentName(INPUT_STATE);
} else if ("".equals(tb.getText()))
removeStyleDependentName(INPUT_STATE);
else
addStyleDependentName(INPUT_STATE);
} else {
if ("".equals(tb.getText()))
removeStyleDependentName(INPUT_STATE);
else
addStyleDependentName(INPUT_STATE);
debug("SEARCH| Current: null");
}
}
}
@ -153,10 +181,12 @@ public class VSearchSelect extends VFilterSelect {
protected void popupKeyDown(KeyDownEvent event) {
switch (event.getNativeKeyCode()) {
case KeyCodes.KEY_DOWN:
keyboardNavigation = true;
suggestionPopup.selectNextItem();
DOM.eventPreventDefault(DOM.eventGetCurrentEvent());
break;
case KeyCodes.KEY_UP:
keyboardNavigation = true;
suggestionPopup.selectPrevItem();
DOM.eventPreventDefault(DOM.eventGetCurrentEvent());
break;
@ -172,11 +202,11 @@ public class VSearchSelect extends VFilterSelect {
filterOptions(currentPage - 1, lastFilter);
}
break;
// case KeyCodes.KEY_TAB:
// if (suggestionPopup.isAttached()) {
// tabPressed = true;
case KeyCodes.KEY_TAB:
if (suggestionPopup.isAttached()) {
tabPressed = true;
// filterOptions(currentPage);
// }
}
// onBlur() takes care of the rest
// break;
case KeyCodes.KEY_ENTER: