revised the way to capture the trigger char
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/widgets/pickitem-widget@100398 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
78d1ad33f2
commit
ad3ed59d4f
|
@ -112,7 +112,7 @@ public class PickItemsDialog extends PopupPanel {
|
|||
focusPanel.addMouseDownHandler(new MouseDownHandler() {
|
||||
@Override
|
||||
public void onMouseDown(MouseDownEvent event) {
|
||||
handleMouseDown();
|
||||
handleMouseDown();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -132,15 +132,19 @@ public class PickItemsDialog extends PopupPanel {
|
|||
* @param currText
|
||||
*/
|
||||
public void onKeyUp(int keyCode, int x, int y, String currText) {
|
||||
if (currText.endsWith(triggerChar)) { //the only way i found to intercept @
|
||||
if (currText.endsWith(triggerChar)) { //the only way i found to intercept the triggerChar
|
||||
setPopupPosition(x, y);
|
||||
hide();
|
||||
} else if (currText.contains(triggerChar)) {
|
||||
if (pickingUser(currText)) {
|
||||
handleNonCharKeys(keyCode);
|
||||
}
|
||||
} else if (!currText.contains(triggerChar))
|
||||
hide();
|
||||
}
|
||||
else {
|
||||
String last3 = (currText.length() > 3) ? currText.substring(currText.length()-3): currText;
|
||||
if (last3.contains(triggerChar)) {
|
||||
if (pickingUser(currText)) {
|
||||
handleNonCharKeys(keyCode);
|
||||
}
|
||||
} else if (!last3.contains(triggerChar))
|
||||
hide();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -148,9 +152,12 @@ public class PickItemsDialog extends PopupPanel {
|
|||
* @param currText the text being typed
|
||||
*/
|
||||
private boolean pickingUser(String currText) {
|
||||
String[] toSplit = currText.split(triggerChar); //get the interesting part
|
||||
if (toSplit[1].trim().length() > 0) {
|
||||
showSuggestions(toSplit[1]);
|
||||
int tPos = currText.lastIndexOf(triggerChar);
|
||||
String toSplit = currText.substring(tPos);
|
||||
String[] splitted = toSplit.split(triggerChar); //get the interesting part
|
||||
|
||||
if (splitted[1].trim().length() > 0) {
|
||||
showSuggestions(splitted[1]);
|
||||
return true;
|
||||
}
|
||||
hide();
|
||||
|
@ -225,7 +232,7 @@ public class PickItemsDialog extends PopupPanel {
|
|||
|
||||
private Widget getUserTemplate(ItemBean user, int displayIndex, boolean hasPhoto) {
|
||||
if (hasPhoto)
|
||||
return new WithPhotoTemplate(this, user, displayIndex);
|
||||
return new WithPhotoTemplate(this, user, displayIndex);
|
||||
return new NoPhotoTemplate(this, user, displayIndex);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue