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

fix(modeling): strip all namespaces for semantic id generation 

Related to #108
This commit is contained in:
Nico Rehwaldt 2014-08-12 11:03:11 +02:00
parent b8db4322ab
commit 86d5c20f07
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/features/modeling/BpmnFactory.js
View File

@ -22,7 +22,9 @@ BpmnFactory.prototype._needsId = function(element) {
BpmnFactory.prototype._ensureId = function(element) { BpmnFactory.prototype._ensureId = function(element) {
var prefix = (element.$type || '').replace(/^\s*bpmn:/g, '') + '_'; // generate semantic ids for elements
// bpmn:SequenceFlow -> SequenceFlow_ID
var prefix = (element.$type || '').replace(/^[^:]*:/g, '') + '_';
if (!element.id && this._needsId(element)) { if (!element.id && this._needsId(element)) {
element.id = this._model.ids.nextPrefixed(prefix, element); element.id = this._model.ids.nextPrefixed(prefix, element);

18
test/spec/features/modeling/BpmnFactorySpec.js
View File

@ -22,18 +22,32 @@ describe('features - bpmn-factory', function() {
beforeEach(bootstrapModeler(diagramXML, { modules: testModules })); beforeEach(bootstrapModeler(diagramXML, { modules: testModules }));
describe('create element', function() { describe('create element', function() {
it('element should be created', inject(function(bpmnFactory) {
it('should return instance', inject(function(bpmnFactory) {
var task = bpmnFactory.create('bpmn:Task'); var task = bpmnFactory.create('bpmn:Task');
expect(task).toBeDefined(); expect(task).toBeDefined();
expect(task.$type).toEqual('bpmn:Task'); expect(task.$type).toEqual('bpmn:Task');
})); }));
it('element id should have semantic prefix', inject(function(bpmnFactory) {
it('should assign id (with semantic prefix)', inject(function(bpmnFactory) {
var task = bpmnFactory.create('bpmn:ServiceTask'); var task = bpmnFactory.create('bpmn:ServiceTask');
expect(task.$type).toEqual('bpmn:ServiceTask'); expect(task.$type).toEqual('bpmn:ServiceTask');
expect(task.id).toMatch(/^ServiceTask_/g); expect(task.id).toMatch(/^ServiceTask_/g);
})); }));
it('should assign id (with semantic prefix)', inject(function(bpmnFactory) {
var plane = bpmnFactory.create('bpmndi:BPMNPlane');
expect(plane.$type).toEqual('bpmndi:BPMNPlane');
expect(plane.id).toMatch(/^BPMNPlane_/g);
}));
}); });