fix for JSKeyEvent

BobHanson · BobHanson · commit cf1aac82eb28 · 2018-03-17T15:54:44.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSKeyEvent.java b/sources/net.sf.j2s.java.core/src/swingjs/JSKeyEvent.java
@@ -19,7 +19,7 @@
 @SuppressWarnings({"serial", "unused"})
 public class JSKeyEvent extends KeyEvent {
 
-	public static JSKeyEvent newJSKeyEvent(JComponent source, Object jQueryEvent) {
+	public static JSKeyEvent newJSKeyEvent(JComponent source, Object jQueryEvent, boolean isList) {
 
 		// JavaScript: keydown      keypress    keyup
 		// Java:       KEY_PRESSED  KEY_TYPED*  KEY_RELEASED
@@ -37,7 +37,7 @@ public static JSKeyEvent newJSKeyEvent(JComponent source, Object jQueryEvent) {
 		 * 			evType = ev.type; jskey = ev.key; 
 		 * 			jskeyCode = ev.keyCode || ev.which;
 		 *          jskeyLocation = ev.originalEvent.location || 0; 
-		 * 			if (evType == "keypress")
+		 * 			if (isList && evType == "keypress")
 		 *            ev.originalEvent.preventDefault();
 		 */
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSListUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSListUI.java
@@ -138,7 +138,7 @@ protected DOMNode updateDOMNode() {
 	public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 		switch (eventType) {
 		case KeyEvent.KEY_PRESSED:
-			JSKeyEvent keyEvent = JSKeyEvent.newJSKeyEvent(jc, jQueryEvent);
+			JSKeyEvent keyEvent = JSKeyEvent.newJSKeyEvent(jc, jQueryEvent, true);
 			if (keyEvent != null)
 				jc.dispatchEvent(keyEvent);
 			break;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTextUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTextUI.java
@@ -224,7 +224,7 @@ public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 		switch (eventType) {
 		case KeyEvent.KEY_PRESSED:
 			// note that events are bundled here into one eventType
-			JSKeyEvent keyEvent = JSKeyEvent.newJSKeyEvent(jc, jQueryEvent);
+			JSKeyEvent keyEvent = JSKeyEvent.newJSKeyEvent(jc, jQueryEvent, false);
 			if (keyEvent == null)
 				return true;
 			jc.dispatchEvent(keyEvent);
