sartography/bpmn-js
1
0
Fork 0
mirror of https://github.com/sartography/bpmn-js.git synced 2025-02-18 11:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(viewer): moddle extensions

Browse Source 
Remove .only from test, replace merge with assign, add extra test

Relates to #471
This commit is contained in:
Vladimirs Katusenoks 2016-02-25 14:07:23 +01:00
parent 0fb1bf616e
commit c793c01169
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Viewer.js
View File

@ -9,8 +9,7 @@
var assign = require('lodash/object/assign'), var assign = require('lodash/object/assign'),
omit = require('lodash/object/omit'), omit = require('lodash/object/omit'),
isString = require('lodash/lang/isString'), isString = require('lodash/lang/isString'),
isNumber = require('lodash/lang/isNumber'), isNumber = require('lodash/lang/isNumber');
merge = require('lodash/object/merge');
var domify = require('min-dom/lib/domify'), var domify = require('min-dom/lib/domify'),
domQuery = require('min-dom/lib/query'), domQuery = require('min-dom/lib/query'),
@ -204,7 +203,7 @@ Viewer.prototype.saveXML = function(options, done) {
}; };
Viewer.prototype.createModdle = function() { Viewer.prototype.createModdle = function() {
return new BpmnModdle(merge(this.options.moddleExtensions, this._moddleExtensions)); return new BpmnModdle(assign({}, this._moddleExtensions, this.options.moddleExtensions));
}; };
/** /**

16
test/spec/ViewerSpec.js
View File

@ -4,6 +4,8 @@ var TestContainer = require('mocha-test-container-support');
var Viewer = require('../../lib/Viewer'); var Viewer = require('../../lib/Viewer');
var inherits = require('inherits');
describe('Viewer', function() { describe('Viewer', function() {
@ -545,17 +547,23 @@ describe('Viewer', function() {
}); });
it.only('should allow to add default custom moddle extensions', function(done) { it('should allow to add default custom moddle extensions', function(done) {
// given
var xml = require('../fixtures/bpmn/extension/custom.bpmn'), var xml = require('../fixtures/bpmn/extension/custom.bpmn'),
additionalModdleDescriptors = { additionalModdleDescriptors = {
custom: require('../fixtures/json/model/custom') custom: require('../fixtures/json/model/custom')
}; };
Viewer.prototype._moddleExtensions = additionalModdleDescriptors; function CustomViewer(options) {
Viewer.call(this, options);
}
// given inherits(CustomViewer, Viewer);
viewer = new Viewer({
CustomViewer.prototype._moddleExtensions = additionalModdleDescriptors;
viewer = new CustomViewer({
container: container, container: container,
moddleExtensions: { moddleExtensions: {
camunda: camundaPackage camunda: camundaPackage