Skip to content

Commit aca4804

Browse files
author
SeungpilPark
committed
#10 Ignore DragPageMovable when scroll is minus
1 parent 196cf21 commit aca4804

5 files changed

Lines changed: 36 additions & 34 deletions

File tree

‎src/main/webapp/opengraph/OpenGraph-0.1.2-SNAPSHOT-All.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/webapp/opengraph/OpenGraph-0.1.2-SNAPSHOT-min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/webapp/opengraph/OpenGraph-0.1.2-SNAPSHOT.js‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20645,13 +20645,16 @@ OG.renderer.RaphaelRenderer.prototype.redrawConnectedEdge = function (element, e
2064520645
}
2064620646
}
2064720647
edge.shape.geom.setVertices(vertices);
20648-
return edgeId;
20648+
return edge;
2064920649
};
20650+
20651+
var edgeToReconnect;
2065020652
edgeId = $(element).attr("_fromedge");
2065120653
if (edgeId) {
2065220654
$.each(edgeId.split(","), function (idx, item) {
2065320655
if (!excludeEdgeId || excludeEdgeId.toString().indexOf(item) < 0) {
20654-
me.connect($(item).attr('_from'), $(item).attr('_to'), rightAngleCalibration(item), null, null, true);
20656+
edgeToReconnect = rightAngleCalibration(item);
20657+
me.connect($(edgeToReconnect).attr('_from'), $(edgeToReconnect).attr('_to'), edgeToReconnect, null, null, true);
2065520658
}
2065620659
});
2065720660
}
@@ -20660,7 +20663,8 @@ OG.renderer.RaphaelRenderer.prototype.redrawConnectedEdge = function (element, e
2066020663
if (edgeId) {
2066120664
$.each(edgeId.split(","), function (idx, item) {
2066220665
if (!excludeEdgeId || excludeEdgeId.toString().indexOf(item) < 0) {
20663-
me.connect($(item).attr('_from'), $(item).attr('_to'), rightAngleCalibration(item), null, null, true);
20666+
edgeToReconnect = rightAngleCalibration(item);
20667+
me.connect($(edgeToReconnect).attr('_from'), $(edgeToReconnect).attr('_to'), edgeToReconnect, null, null, true);
2066420668
}
2066520669
});
2066620670
}
@@ -27831,8 +27835,8 @@ OG.handler.EventHandler.prototype = {
2783127835
if (isConnectMode === 'active' || isRectMode === 'active') {
2783227836
return;
2783327837
}
27834-
var eventOffset = me._getOffset(event);
27835-
$(root).data("dragPageMove", {x: eventOffset.x, y: eventOffset.y});
27838+
$(root).data("dragPageMove", {x: event.pageX, y: event.pageY});
27839+
$(root).data("dragPageScroll", {x: container.scrollLeft, y: container.scrollTop});
2783627840
});
2783727841
$(rootEle).bind("mousemove", function (event) {
2783827842
root = renderer.getRootGroup();
@@ -27842,18 +27846,14 @@ OG.handler.EventHandler.prototype = {
2784227846
if (isConnectMode === 'active' || isRectMode === 'active' || isResizing === 'active') {
2784327847
return;
2784427848
}
27845-
var pageMove = $(root).data("dragPageMove"), eventOffset;
27849+
var pageMove = $(root).data("dragPageMove");
27850+
var pageScroll = $(root).data("dragPageScroll");
2784627851

2784727852
if (pageMove) {
27848-
eventOffset = me._getOffset(event);
27849-
var moveX = eventOffset.x - pageMove.x;
27850-
var moveY = eventOffset.y - pageMove.y;
27851-
var cuScrollLeft = container.scrollLeft;
27852-
var cuScrollTop = container.scrollTop;
27853-
if((cuScrollLeft - moveX) >= 0 && (cuScrollTop - moveY) >= 0){
27854-
$(container).scrollLeft(cuScrollLeft - moveX);
27855-
$(container).scrollTop(cuScrollTop - moveY);
27856-
}
27853+
var moveX = event.pageX - pageMove.x;
27854+
var moveY = event.pageY - pageMove.y;
27855+
$(container).scrollLeft(pageScroll.x - moveX);
27856+
$(container).scrollTop(pageScroll.y - moveY);
2785727857
}
2785827858
});
2785927859
$(rootEle).bind("mouseup", function (event) {
@@ -27864,6 +27864,7 @@ OG.handler.EventHandler.prototype = {
2786427864
return;
2786527865
}
2786627866
$(root).removeData('dragPageMove');
27867+
$(root).removeData('dragPageScroll');
2786727868
});
2786827869
},
2786927870

‎src/main/webapp/src/handler/EventHandler.js‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2029,8 +2029,8 @@ OG.handler.EventHandler.prototype = {
20292029
if (isConnectMode === 'active' || isRectMode === 'active') {
20302030
return;
20312031
}
2032-
var eventOffset = me._getOffset(event);
2033-
$(root).data("dragPageMove", {x: eventOffset.x, y: eventOffset.y});
2032+
$(root).data("dragPageMove", {x: event.pageX, y: event.pageY});
2033+
$(root).data("dragPageScroll", {x: container.scrollLeft, y: container.scrollTop});
20342034
});
20352035
$(rootEle).bind("mousemove", function (event) {
20362036
root = renderer.getRootGroup();
@@ -2040,18 +2040,14 @@ OG.handler.EventHandler.prototype = {
20402040
if (isConnectMode === 'active' || isRectMode === 'active' || isResizing === 'active') {
20412041
return;
20422042
}
2043-
var pageMove = $(root).data("dragPageMove"), eventOffset;
2043+
var pageMove = $(root).data("dragPageMove");
2044+
var pageScroll = $(root).data("dragPageScroll");
20442045

20452046
if (pageMove) {
2046-
eventOffset = me._getOffset(event);
2047-
var moveX = eventOffset.x - pageMove.x;
2048-
var moveY = eventOffset.y - pageMove.y;
2049-
var cuScrollLeft = container.scrollLeft;
2050-
var cuScrollTop = container.scrollTop;
2051-
if((cuScrollLeft - moveX) >= 0 && (cuScrollTop - moveY) >= 0){
2052-
$(container).scrollLeft(cuScrollLeft - moveX);
2053-
$(container).scrollTop(cuScrollTop - moveY);
2054-
}
2047+
var moveX = event.pageX - pageMove.x;
2048+
var moveY = event.pageY - pageMove.y;
2049+
$(container).scrollLeft(pageScroll.x - moveX);
2050+
$(container).scrollTop(pageScroll.y - moveY);
20552051
}
20562052
});
20572053
$(rootEle).bind("mouseup", function (event) {
@@ -2062,6 +2058,7 @@ OG.handler.EventHandler.prototype = {
20622058
return;
20632059
}
20642060
$(root).removeData('dragPageMove');
2061+
$(root).removeData('dragPageScroll');
20652062
});
20662063
},
20672064

‎src/main/webapp/src/renderer/RaphaelRenderer.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2401,13 +2401,16 @@ OG.renderer.RaphaelRenderer.prototype.redrawConnectedEdge = function (element, e
24012401
}
24022402
}
24032403
edge.shape.geom.setVertices(vertices);
2404-
return edgeId;
2404+
return edge;
24052405
};
2406+
2407+
var edgeToReconnect;
24062408
edgeId = $(element).attr("_fromedge");
24072409
if (edgeId) {
24082410
$.each(edgeId.split(","), function (idx, item) {
24092411
if (!excludeEdgeId || excludeEdgeId.toString().indexOf(item) < 0) {
2410-
me.connect($(item).attr('_from'), $(item).attr('_to'), rightAngleCalibration(item), null, null, true);
2412+
edgeToReconnect = rightAngleCalibration(item);
2413+
me.connect($(edgeToReconnect).attr('_from'), $(edgeToReconnect).attr('_to'), edgeToReconnect, null, null, true);
24112414
}
24122415
});
24132416
}
@@ -2416,7 +2419,8 @@ OG.renderer.RaphaelRenderer.prototype.redrawConnectedEdge = function (element, e
24162419
if (edgeId) {
24172420
$.each(edgeId.split(","), function (idx, item) {
24182421
if (!excludeEdgeId || excludeEdgeId.toString().indexOf(item) < 0) {
2419-
me.connect($(item).attr('_from'), $(item).attr('_to'), rightAngleCalibration(item), null, null, true);
2422+
edgeToReconnect = rightAngleCalibration(item);
2423+
me.connect($(edgeToReconnect).attr('_from'), $(edgeToReconnect).attr('_to'), edgeToReconnect, null, null, true);
24202424
}
24212425
});
24222426
}

0 commit comments

Comments
 (0)