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

chore(modeling/rules): reduce complexity 

Related to #176
This commit is contained in:
Nico Rehwaldt 2015-01-29 14:03:17 +01:00
parent d8057a2acc
commit a899df2a12
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/features/modeling/rules/ModelingRules.js
View File

@ -17,31 +17,40 @@ ModelingRules.prototype = Object.create(RuleProvider.prototype);
ModelingRules.prototype.init = function() { ModelingRules.prototype.init = function() {
function nonExistantOrLabel(element) {
return !element || element.labelTarget;
}
function isSame(a, b) {
return a === b;
}
// rules // rules
function canConnect(source, target, connection) { function canConnect(source, target, connection) {
if (!source || source.labelTarget || !target || target.labelTarget) { if (nonExistantOrLabel(source) || nonExistantOrLabel(target)) {
return null; return null;
} }
var sourceBo = source.businessObject,
targetBo = target.businessObject,
connectionBo = connection && connection.businessObject;
if (sourceBo.$parent !== targetBo.$parent) {
return false;
}
// See https://github.com/bpmn-io/bpmn-js/issues/178 // See https://github.com/bpmn-io/bpmn-js/issues/178
// as a workround we disallow connections with same // as a workround we disallow connections with same
// target and source element. // target and source element.
// This rule must be removed if a auto layout for this // This rule must be removed if a auto layout for this
// connections is implemented. // connections is implemented.
if (sourceBo === targetBo) { if (isSame(source, target)) {
return false; return false;
} }
// only move between the same parent
if (!isSame(source.parent, target.parent)) {
return false;
}
var sourceBo = source.businessObject,
targetBo = target.businessObject,
connectionBo = connection && connection.businessObject;
if (connectionBo && connectionBo.$instanceOf('bpmn:SequenceFlow')) { if (connectionBo && connectionBo.$instanceOf('bpmn:SequenceFlow')) {
if (!sourceBo.$instanceOf('bpmn:FlowNode') || if (!sourceBo.$instanceOf('bpmn:FlowNode') ||
@ -165,7 +174,7 @@ ModelingRules.prototype.init = function() {
// into source // into source
var t = target; var t = target;
while (t) { while (t) {
if (t === source) { if (isSame(t, source)) {
return false; return false;
} }