fix(draw/BpmnRenderer): use cross-browser compatible font size
This commit is contained in:
parent
00bd2712e2
commit
f09120af90
|
@ -23,7 +23,7 @@ function BpmnRenderer(events, styles, bpmnRegistry, pathMap) {
|
|||
|
||||
var LABEL_STYLE = {
|
||||
fontFamily: '"Helvetica Neue", Helvetica, Arial, sans-serif',
|
||||
fontSize: '13px'
|
||||
fontSize: '10pt'
|
||||
};
|
||||
|
||||
var labelUtil = new LabelUtil({
|
||||
|
@ -222,14 +222,12 @@ function BpmnRenderer(events, styles, bpmnRegistry, pathMap) {
|
|||
}
|
||||
|
||||
if (isTypedEvent(event, 'bpmn:CancelEventDefinition') &&
|
||||
isTypedEvent(event, 'bpmn:TerminateEventDefinition') &&
|
||||
!bpmnRegistry.getSemantic(data.id).parallelMultiple) {
|
||||
isTypedEvent(event, 'bpmn:TerminateEventDefinition', { parallelMultiple: false })) {
|
||||
return renderer('bpmn:MultipleEventDefinition')(p, data, isThrowing);
|
||||
}
|
||||
|
||||
if (isTypedEvent(event, 'bpmn:CancelEventDefinition') &&
|
||||
isTypedEvent(event, 'bpmn:TerminateEventDefinition') &&
|
||||
!!bpmnRegistry.getSemantic(data.id).parallelMultiple) {
|
||||
isTypedEvent(event, 'bpmn:TerminateEventDefinition', { parallelMultiple: true })) {
|
||||
return renderer('bpmn:ParallelMultipleEventDefinition')(p, data, isThrowing);
|
||||
}
|
||||
|
||||
|
@ -970,8 +968,14 @@ function BpmnRenderer(events, styles, bpmnRegistry, pathMap) {
|
|||
*/
|
||||
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 definition.$type === eventDefinitionType && (!filter || _.all([ definition ], filter));
|
||||
return definition.$type === eventDefinitionType && matches(definition, filter);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue