This commit is contained in:
Nico Rehwaldt 2015-06-24 13:14:00 +02:00
parent b40ba05dae
commit 51014d95a2
2 changed files with 23 additions and 16 deletions

View File

@ -278,39 +278,46 @@ BpmnSnapping.prototype.initSnap = function(event) {
});
});
}
var source = context.source,
connectedShapes,
shapeOrigin;
var source = context.source,
connectedShapes;
if (is(shape, 'bpmn:FlowNode')) {
if (is(shape, 'bpmn:FlowNode')) {
connectedShapes = getConnectedShapes(shape);
connectedShapes = getConnectedShapes(shape);
// add snapping to source element (inline elements during attach)
if (source) {
snapContext.addDefaultSnap('mid', mid(source));
// add snapping to source element (inline elements during attach)
if (source) {
snapContext.addDefaultSnap('mid', mid(source));
connectedShapes.push(source);
}
connectedShapes.push(source);
shapeOrigin = {
x: shapeMid.x - event.x,
y: shapeMid.y - event.y
};
// add distance guides (better placement on diagram)
this.addDistanceSnapping(snapContext, shape, shapeOrigin, connectedShapes);
}
// add distance guides (better placement on diagram)
this.addDistanceSnapping(snapContext, shape, connectedShapes);
}
};
BpmnSnapping.prototype.addDistanceSnapping = function(snapContext, shape, connectedShapes) {
BpmnSnapping.prototype.addDistanceSnapping = function(snapContext, shape, shapeOrigin, connectedShapes, location) {
var self = this;
snapContext.setSnapOrigin('distance', shapeOrigin);
var axisDistance = {
x: 100,
x: 80,
y: 50
};
forEach(connectedShapes, function(connectedShape) {
self.addDefaultDistanceSnaps(snapContext, shape, connectedShape, axisDistance);
self.addDefaultDistanceSnaps(snapContext, shape, connectedShape, axisDistance, 'distance');
});
};

View File

@ -22,7 +22,7 @@ describe('Modeler', function() {
}
iit('should import simple process', function(done) {
it.only('should import simple process', function(done) {
var xml = require('../fixtures/bpmn/simple.bpmn');
createModeler(xml, done);
});