@@ -12113,15 +12113,15 @@ console.log("J2S._getRawDataFromServer " + J2S._serverUrl + " for " + query);
1211312113
1211412114 // ////////////////// mouse and key events //////////////////////
1211512115
12116- var doIgnore = function(ev) {
12116+ var doIgnore = function(ev,test ) {
1211712117 var ignore = (
12118- //J2S._dmouseOwner
12119- //||
12120- ev.originalEvent.xhandled
12118+ J2S._dmouseOwner && J2S._dmouseOwner.className == "swingjs-resizer"
12119+ || ev.originalEvent.xhandled
1212112120 || !ev.target
1212212121 || ("" + ev.target.className).indexOf("swingjs-ui") >= 0
1212312122 );
12124- ev.originalEvent.xhandled = true;
12123+ if (!test)
12124+ ev.originalEvent.xhandled = true;
1212512125 return ignore;
1212612126 };
1212712127
@@ -12199,7 +12199,7 @@ if (!target) {
1219912199 ,"\n relatedtarget.id:",ev.originalEvent.relatedTarget && ev.originalEvent.relatedTarget.id
1220012200 ,"\n who:", who.id
1220112201 ,"\n dragging:", J2S._mouseOwner && J2S._mouseOwner.isDragging
12202- ,"doignore:",doIgnore(ev)
12202+ ,"doignore:",doIgnore(ev,1 )
1220312203 ,"role:",ev.target.getAttribute("role")
1220412204 ,"data-ui:",ev.target["data-ui"]
1220512205 ,"data-component:",ev.target["data-component"]
@@ -12209,6 +12209,11 @@ if (!target) {
1220912209
1221012210 J2S.$bind(who, 'mousemove touchmove', function(ev) { // touchmove
1221112211
12212+
12213+ if (J2S._dmouseOwner) {
12214+ J2S._dmouseDrag(ev);
12215+ }
12216+
1221212217 if (J2S._traceMouseMove)
1221312218 J2S.traceMouse("MOVE", ev);
1221412219
@@ -13479,6 +13484,8 @@ if (!target) {
1347913484
1348013485 var down = function(ev) {
1348113486 J2S._dmouseOwner = tag;
13487+ J2S._dmouseDrag = drag;
13488+
1348213489 tag.isDragging = true; // used by J2S mouse event business
1348313490 pageX = ev.pageX;
1348413491 pageY = ev.pageY;
@@ -13504,7 +13511,8 @@ if (!target) {
1350413511 }, drag = function(ev) {
1350513512 // we will move the frame's parent node and take the frame along
1350613513 // with it
13507- if (ev.buttons == 0 && ev.button == 0)
13514+ var ev0 = ev.ev0 || ev;
13515+ if (ev0.buttons == 0 && ev0.button == 0)
1350813516 tag.isDragging = false;
1350913517 var mode = (tag.isDragging ? 506 : 503);
1351013518 if (!J2S._dmouseOwner || tag.isDragging && J2S._dmouseOwner == tag) {
@@ -13525,6 +13533,7 @@ if (!target) {
1352513533 }
1352613534 }
1352713535 }, up = function(ev) {
13536+ J2S._dmouseDrag = null;
1352813537 if (J2S._dmouseOwner == tag) {
1352913538 tag.isDragging = false;
1353013539 J2S._dmouseOwner = null
0 commit comments