Author: dongxu
Date: Thu Sep 12 04:55:58 2013
New Revision: 1522417
URL: http://svn.apache.org/r1522417
Log:
Avoid entering a new-line in the textarea when selecting a suggestion element
Modified:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
Modified:
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java?rev=1522417&r1=1522416&r2=1522417&view=diff
==============================================================================
---
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
(original)
+++
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/ui/MultiValueSuggestArea.java
Thu Sep 12 04:55:58 2013
@@ -21,6 +21,7 @@ package org.apache.hupa.widgets.ui;
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.event.dom.client.KeyDownEvent;
import com.google.gwt.event.dom.client.KeyDownHandler;
@@ -28,6 +29,11 @@ import com.google.gwt.event.dom.client.K
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+import com.google.gwt.event.dom.client.KeyCodes;
+import com.google.gwt.event.dom.client.KeyDownEvent;
+import com.google.gwt.event.dom.client.KeyDownHandler;
+>>>>>>> Avoid entering a new-line in the textarea when selecting a suggestion
element
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.Focusable;
@@ -60,6 +66,9 @@ public class MultiValueSuggestArea exten
super(oracle, new TextArea() {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Avoid entering a new-line in the textarea when selecting a suggestion
element
{
// Avoid entering a new-line when selecting a suggestion
element
@@ -72,10 +81,13 @@ public class MultiValueSuggestArea exten
}
});
}
+<<<<<<< HEAD
=======
>>>>>>> first commit
=======
>>>>>>> first commit
+=======
+>>>>>>> Avoid entering a new-line in the textarea when selecting a suggestion
element
String search = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
