java2script
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎
116 KB b/‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎
116 KB
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎
Lines changed: 1 addition & 1 deletion b/‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip‎
116 KB b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip‎
116 KB
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp‎
Lines changed: 1 addition & 1 deletion b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
116 KB b/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
116 KB
diff --git a/‎sources/net.sf.j2s.java.core/src/swingjs/JSGraphicsConfiguration.java‎
Lines changed: 2 additions & 2 deletions b/‎sources/net.sf.j2s.java.core/src/swingjs/JSGraphicsConfiguration.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java‎
Lines changed: 2 additions & 2 deletions b/‎sources/net.sf.j2s.java.core/src/swingjs/JSMouse.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java‎
Lines changed: 2 additions & 1 deletion b/‎sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java‎
Lines changed: 12 additions & 0 deletions b/‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSEditorPaneUI.java‎
Lines changed: 1 addition & 0 deletions b/‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSEditorPaneUI.java‎
Lines changed: 1 addition & 0 deletions
@@ -1 +1 @@
-20190816123836 
+20190817161814 
@@ -1 +1 @@
-20190816123836 
+20190817161814 
@@ -56,9 +56,9 @@ protected BufferedImage newBufferedImage(ColorModel cm, WritableRaster wr,
 			boolean alphaPremultiplied, Hashtable<?, ?> properties) {
 		return (BufferedImage) Interface.getInstanceWithParams(
 				"java.awt.image.BufferedImage", new Class<?>[] { ColorModel.class,
-						WritableRaster.class, Boolean.class, Hashtable.class },
+						WritableRaster.class, boolean.class, Hashtable.class },
 				new Object[] { cm, wr,
-						alphaPremultiplied ? Boolean.TRUE : Boolean.FALSE, properties });
+						alphaPremultiplied, properties });
 	}
 
 	@Override
 
@@ -495,8 +495,8 @@ private static boolean isPopupTrigger(int id, int mods, boolean isWin) {
 
 	private boolean keyAction(int id, Object jqevent, long time) {
 		JComponent c = 	/** @j2sNative 
-		jqevent.target["data-shadowkeycomponent"] || jqevent.target["data-keycomponent"]
-				 */null;
+		jqevent.target["data-shadowkeycomponent"] || jqevent.target["data-keycomponent"] ||
+				 */null; 
 		return JSKeyEvent.dispatchKeyEvent(c, id, jqevent, time);
 	}
 
 
@@ -964,12 +964,13 @@ public static void consumeEvent(Object e) {
 		// SwingJS stop any further processing at all within the browser
 		Object jqevent = null;
 		if (e instanceof InputEvent) {
-			jqevent = /** @j2sNative e.bdata.jqevent || */null; 
+			jqevent = /** @j2sNative e.bdata && e.bdata.jqevent || */null; 
 		} else {
 			jqevent = e;
 		}
 		if (jqevent == null)
 			return;
+		
 		/**
 		 * @j2sNative 
 		 * 		jqevent.stopPropagation();
 
@@ -1103,6 +1103,18 @@ protected void bindJSKeyEvents(DOMNode node, boolean addFocus) {
 		}
 	}
 
+
+
+	/**
+	 * Signal to swingjs2 to ignore the event, as it has been handled already.
+	 * 
+	 * @param jqevent
+	 */
+	void setIgnoreEvent(Object jqevent) {
+		/**
+		 * @j2sNative jqevent.originalEvent.xhandled = true;
+		 */
+	}
 	/**
 	 * Allows mouse and keyboard handling via an overridden method
 	 * 
 
@@ -949,6 +949,7 @@ public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 			 * 			jQueryEvent.preventDefault(); 
 			 * 			jQueryEvent.stopPropagation();
 			 */
+			setIgnoreEvent(jQueryEvent);
 			return HANDLED;
 		}
 	}
Original file line number	Diff line number	Diff line change
`@@ -495,8 +495,8 @@ private static boolean isPopupTrigger(int id, int mods, boolean isWin) {`
`495`	`495`
`496`	`496`	`private boolean keyAction(int id, Object jqevent, long time) {`
`497`	`497`	`JComponent c = /** @j2sNative`
`498`		`- jqevent.target["data-shadowkeycomponent"] \|\| jqevent.target["data-keycomponent"]`
`499`		`- */null;`
	`498`	`+ jqevent.target["data-shadowkeycomponent"] \|\| jqevent.target["data-keycomponent"] \|\|`
	`499`	`+ */null;`
`500`	`500`	`return JSKeyEvent.dispatchKeyEvent(c, id, jqevent, time);`
`501`	`501`	`}`
`502`	`502`
Original file line number	Diff line number	Diff line change
`@@ -1103,6 +1103,18 @@ protected void bindJSKeyEvents(DOMNode node, boolean addFocus) {`
`1103`	`1103`	`}`
`1104`	`1104`	`}`
`1105`	`1105`
	`1106`	`+`
	`1107`	`+`
	`1108`	`+ /**`
	`1109`	`+ * Signal to swingjs2 to ignore the event, as it has been handled already.`
	`1110`	`+ *`
	`1111`	`+ * @param jqevent`
	`1112`	`+ */`
	`1113`	`+ void setIgnoreEvent(Object jqevent) {`
	`1114`	`+ /**`
	`1115`	`+ * @j2sNative jqevent.originalEvent.xhandled = true;`
	`1116`	`+ */`
	`1117`	`+ }`
`1106`	`1118`	`/**`
`1107`	`1119`	`* Allows mouse and keyboard handling via an overridden method`
`1108`	`1120`	`*`
Original file line number	Diff line number	Diff line change
`@@ -949,6 +949,7 @@ public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {`
`949`	`949`	`* jQueryEvent.preventDefault();`
`950`	`950`	`* jQueryEvent.stopPropagation();`
`951`	`951`	`*/`
	`952`	`+ setIgnoreEvent(jQueryEvent);`
`952`	`953`	`return HANDLED;`
`953`	`954`	`}`
`954`	`955`	`}`