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

fix(draw/BpmnRenderer): use cross-browser compatible font size

This commit is contained in:
Nico Rehwaldt 2014-05-02 18:20:36 +02:00
parent 00bd2712e2
commit f09120af90
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/draw/BpmnRenderer.js
View File

@ -23,7 +23,7 @@ function BpmnRenderer(events, styles, bpmnRegistry, pathMap) {
var LABEL_STYLE = { var LABEL_STYLE = {
fontFamily: '"Helvetica Neue", Helvetica, Arial, sans-serif', fontFamily: '"Helvetica Neue", Helvetica, Arial, sans-serif',
fontSize: '13px' fontSize: '10pt'
}; };
var labelUtil = new LabelUtil({ var labelUtil = new LabelUtil({
@ -222,14 +222,12 @@ function BpmnRenderer(events, styles, bpmnRegistry, pathMap) {
} }
if (isTypedEvent(event, 'bpmn:CancelEventDefinition') && if (isTypedEvent(event, 'bpmn:CancelEventDefinition') &&
isTypedEvent(event, 'bpmn:TerminateEventDefinition') && isTypedEvent(event, 'bpmn:TerminateEventDefinition', { parallelMultiple: false })) {
!bpmnRegistry.getSemantic(data.id).parallelMultiple) {
return renderer('bpmn:MultipleEventDefinition')(p, data, isThrowing); return renderer('bpmn:MultipleEventDefinition')(p, data, isThrowing);
} }
if (isTypedEvent(event, 'bpmn:CancelEventDefinition') && if (isTypedEvent(event, 'bpmn:CancelEventDefinition') &&
isTypedEvent(event, 'bpmn:TerminateEventDefinition') && isTypedEvent(event, 'bpmn:TerminateEventDefinition', { parallelMultiple: true })) {
!!bpmnRegistry.getSemantic(data.id).parallelMultiple) {
return renderer('bpmn:ParallelMultipleEventDefinition')(p, data, isThrowing); return renderer('bpmn:ParallelMultipleEventDefinition')(p, data, isThrowing);
} }
@ -970,8 +968,14 @@ function BpmnRenderer(events, styles, bpmnRegistry, pathMap) {
*/ */
function isTypedEvent(event, eventDefinitionType, filter) { function isTypedEvent(event, eventDefinitionType, filter) {
function matches(definition, filter) {
return _.all(filter, function(val, key) {
return definition[key] == val;
});
}
return _.any(event.eventDefinitions, function(definition) { return _.any(event.eventDefinitions, function(definition) {
return definition.$type === eventDefinitionType && (!filter || _.all([ definition ], filter)); return definition.$type === eventDefinitionType && matches(definition, filter);
}); });
} }