Better mouse and touch response

BobHanson · BobHanson · commit 478c7ee227eb · 2024-01-19T11:49:17.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/JQueryUI.java b/sources/net.sf.j2s.java.core/src/swingjs/jquery/JQueryUI.java
@@ -2,7 +2,7 @@
 
 import swingjs.JSUtil;
 
-//based on  jQuery UI - v1.9.2 - 2015-05-28
+//based on  jQuery UI - v1.9.2 - 2015-05-28 
 
 // BH 2023.01.07 updated j2sMenu.js for better touch with delayed menu closure detecting mouse
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js
@@ -238,6 +238,16 @@ J2S.__makeMenu = function(){};
 			 System.err.println("j2sMenu error: " + err);
 		 }
 		 return;
+	 case "closeSiblingMenus":
+		 var m = t.closest("ul").find(".ui-state-active")
+		 m.removeClass("ui-state-active");
+		 var v = t.find(".ui-j2smenu");
+		 if (!v.length)
+			 return;
+		 doCmd("_hide", me, v);
+		 v.attr("aria-hidden","true").attr("aria-expanded","false");
+		 t = v.parent();
+		 return;
 	 case "_closeSubmenus":
 		 var a = me.active;
 		 if (a && a[0] && a[0]["data-component"].getUIClassID$() != "MenuUI")
@@ -320,6 +330,10 @@ J2S.__makeMenu = function(){};
 			 return;
 		 me.unsetFocus(t,t&&t.type==="focus", "fromSetFocus");
 		 me._scrollIntoView(n);
+		 // BH added 2024.01.16
+		 n.siblings().each(function(a,b){
+				 doCmd("closeSiblingMenus", me, $(b));
+		 })
 		 me.active=a;
 		 var r=me.active.addClass("ui-state-focus");
 		 //testing var r=me.active.children(".a").addClass("ui-state-focus");
@@ -716,4 +730,4 @@ Swing.disposeMenu = function(menu) {
 })(J2S.Swing, J2S.__$);
 
 
-// end of j2sMenu.js 2023.06.04 2020.06.09 2020.05.15  2020.01.25
+// end of j2sMenu.js 2024.01.16 2023.06.04 2020.06.09 2020.05.15  2020.01.25
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPopupMenuUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPopupMenuUI.java
@@ -1268,6 +1268,8 @@ public static void processJ2SMenuCmd(Object[] data) {
 			System.err.println("JSPopupMenu not processing " + trigger);
 			break;
 		}
+		// delay any closures for 100 ms
+		showTime = System.currentTimeMillis();
 		if (e != null && eventID != 0 && c != null) {
 				JSMouse.retargetMouseEvent(e, base, c, c, eventID);
 		}

Original file line number	Diff line number	Diff line change
`@@ -1268,6 +1268,8 @@ public static void processJ2SMenuCmd(Object[] data) {`
`1268`	`1268`	`System.err.println("JSPopupMenu not processing " + trigger);`
`1269`	`1269`	`break;`
`1270`	`1270`	`}`
	`1271`	`+ // delay any closures for 100 ms`
	`1272`	`+ showTime = System.currentTimeMillis();`
`1271`	`1273`	`if (e != null && eventID != 0 && c != null) {`
`1272`	`1274`	`JSMouse.retargetMouseEvent(e, base, c, c, eventID);`
`1273`	`1275`	`}`