Commit478c7ee

committed

Better mouse and touch response

1 parent254dade commit478c7eeCopy full SHA for 478c7ee

File tree

+18

-2

lines changed

+18

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`importswingjs.JSUtil;`
`4`	`4`
`5`		`-//based on jQuery UI - v1.9.2 - 2015-05-28`
	`5`	`+//based on jQuery UI - v1.9.2 - 2015-05-28`
`6`	`6`
`7`	`7`	`// BH 2023.01.07 updated j2sMenu.js for better touch with delayed menu closure detecting mouse`
`8`	`8`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,16 @@ J2S.__makeMenu = function(){};`
`238`	`238`	`System.err.println("j2sMenu error: "+err);`
`239`	`239`	`}`
`240`	`240`	`return;`
	`241`	`+case"closeSiblingMenus":`
	`242`	`+varm=t.closest("ul").find(".ui-state-active")`
	`243`	`+m.removeClass("ui-state-active");`
	`244`	`+varv=t.find(".ui-j2smenu");`
	`245`	`+if(!v.length)`
	`246`	`+return;`
	`247`	`+doCmd("_hide",me,v);`
	`248`	`+v.attr("aria-hidden","true").attr("aria-expanded","false");`
	`249`	`+t=v.parent();`
	`250`	`+return;`
`241`	`251`	`case"_closeSubmenus":`
`242`	`252`	`vara=me.active;`
`243`	`253`	`if(a&&a[0]&&a[0]["data-component"].getUIClassID$()!="MenuUI")`
`@@ -320,6 +330,10 @@ J2S.__makeMenu = function(){};`
`320`	`330`	`return;`
`321`	`331`	`me.unsetFocus(t,t&&t.type==="focus","fromSetFocus");`
`322`	`332`	`me._scrollIntoView(n);`
	`333`	`+// BH added 2024.01.16`
	`334`	`+n.siblings().each(function(a,b){`
	`335`	`+doCmd("closeSiblingMenus",me,$(b));`
	`336`	`+})`
`323`	`337`	`me.active=a;`
`324`	`338`	`varr=me.active.addClass("ui-state-focus");`
`325`	`339`	`//testing var r=me.active.children(".a").addClass("ui-state-focus");`
`@@ -716,4 +730,4 @@ Swing.disposeMenu = function(menu) {`
`716`	`730`	`})(J2S.Swing,J2S.__$);`
`717`	`731`
`718`	`732`
`719`		`-// end of j2sMenu.js 2023.06.04 2020.06.09 2020.05.15 2020.01.25`
	`733`	`+// end of j2sMenu.js2024.01.162023.06.04 2020.06.09 2020.05.15 2020.01.25`

Lines changed: 2 additions & 0 deletions

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`	`}`

Comments

(0)