sartography
/
bpmn-js
mirror of https://github.com/sartography/bpmn-js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(layouting): account for connection(Start|End) hints 

Related to bpmn-io/diagram-js#167
This commit is contained in:
Nico Rehwaldt 2016-06-27 00:29:54 +02:00
parent d87cbc3b79
commit f5f05ac011
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/features/modeling/BpmnLayouter.js
View File

@ -37,8 +37,13 @@ BpmnLayouter.prototype.layoutConnection = function(connection, hints) {
var manhattanOptions, var manhattanOptions,
updatedWaypoints; updatedWaypoints;
start = getConnectionDocking(waypoints, 0, source, start); if (!start) {
end = getConnectionDocking(waypoints, waypoints && waypoints.length - 1, target, end); start = getConnectionDocking(waypoints && waypoints[0], source);
}
if (!end) {
end = getConnectionDocking(waypoints && waypoints[waypoints.length - 1], target);
}
// TODO(nikku): support vertical modeling // TODO(nikku): support vertical modeling
// and invert preferredLayouts accordingly // and invert preferredLayouts accordingly
@ -47,7 +52,7 @@ BpmnLayouter.prototype.layoutConnection = function(connection, hints) {
is(connection, 'bpmn:DataAssociation')) { is(connection, 'bpmn:DataAssociation')) {
if (waypoints && !isCompensationAssociation(connection)) { if (waypoints && !isCompensationAssociation(connection)) {
return waypoints; return [].concat([ start ], waypoints.slice(1, -1), [ end ]);
} }
} }
@ -167,10 +172,8 @@ function getAttachOrientation(attachedElement) {
} }
function getConnectionDocking(waypoints, idx, shape, defaultPoint) { function getConnectionDocking(point, shape) {
var point = waypoints && waypoints[idx]; return point ? (point.original || point) : getMid(shape);
return point ? (point.original || point) : (defaultPoint || getMid(shape));
} }
function isCompensationAssociation(connection) { function isCompensationAssociation(connection) {