From 0b8baccd3293b0698c674bb2b26830ee24755519 Mon Sep 17 00:00:00 2001 From: Nico Rehwaldt Date: Mon, 17 Nov 2014 11:01:07 +0100 Subject: [PATCH] feat(palette): migrate to icon font Related to #148 --- ...nPaletteProvider.js => PaletteProvider.js} | 52 ++++++------------- lib/features/palette/index.js | 4 +- .../palette/BpmnPaletteProviderSpec.js | 50 ------------------ .../features/palette/PaletteProviderSpec.js | 40 ++++++++++++++ 4 files changed, 58 insertions(+), 88 deletions(-) rename lib/features/palette/{BpmnPaletteProvider.js => PaletteProvider.js} (52%) delete mode 100644 test/spec/features/palette/BpmnPaletteProviderSpec.js create mode 100644 test/spec/features/palette/PaletteProviderSpec.js diff --git a/lib/features/palette/BpmnPaletteProvider.js b/lib/features/palette/PaletteProvider.js similarity index 52% rename from lib/features/palette/BpmnPaletteProvider.js rename to lib/features/palette/PaletteProvider.js index e0ac12d6..dae8bddc 100644 --- a/lib/features/palette/BpmnPaletteProvider.js +++ b/lib/features/palette/PaletteProvider.js @@ -4,12 +4,10 @@ var _ = require('lodash'), $ = require('jquery'); /** - * A BPMN instance of the palette. + * A palette provider for BPMN 2.0 elements. */ -function BpmnPaletteProvider(eventBus, palette, modeling, elementRegistry, canvas) { +function PaletteProvider(palette, modeling, elementRegistry, canvas) { - this._eventBus = eventBus; - this._palette = palette; this._modeling = modeling; this._elementRegistry = elementRegistry; this._canvas = canvas; @@ -17,12 +15,12 @@ function BpmnPaletteProvider(eventBus, palette, modeling, elementRegistry, canva palette.registerProvider(this); } -module.exports = BpmnPaletteProvider; +module.exports = PaletteProvider; -BpmnPaletteProvider.$inject = [ 'eventBus', 'palette', 'modeling', 'elementRegistry', 'canvas' ]; +PaletteProvider.$inject = [ 'palette', 'modeling', 'elementRegistry', 'canvas' ]; -BpmnPaletteProvider.prototype.getPaletteEntries = function(element) { +PaletteProvider.prototype.getPaletteEntries = function(element) { var actions = {}, modeling = this._modeling, @@ -40,7 +38,7 @@ BpmnPaletteProvider.prototype.getPaletteEntries = function(element) { _.extend(actions, { 'add.start-event': { group: 'model-event', - img: '', + className: 'icon-start-event', alt: 'Start Event', action: function(event, element) { modeling.createShape({ @@ -48,10 +46,9 @@ BpmnPaletteProvider.prototype.getPaletteEntries = function(element) { }, center, root); } }, - 'add.inter-throw-event': { + 'add.intermediate-throw-event': { group: 'model-event', - img: '' + - '', + className: 'icon-intermediate-event', alt: 'Intermediate Throw Event', action: function(event, element) { modeling.createShape({ @@ -61,7 +58,7 @@ BpmnPaletteProvider.prototype.getPaletteEntries = function(element) { }, 'add.end-event': { group: 'model-event', - img: '', + className: 'icon-end-event', alt: 'End Event', action: function(event, element) { modeling.createShape({ @@ -71,8 +68,7 @@ BpmnPaletteProvider.prototype.getPaletteEntries = function(element) { }, 'add.exclusive-gateway': { group: 'model-gateway', - img: '', + className: 'icon-gateway', alt: 'Exclusive Gateway', action: function(event, element) { modeling.createShape({ @@ -82,8 +78,7 @@ BpmnPaletteProvider.prototype.getPaletteEntries = function(element) { }, 'add.task': { group: 'model-activity', - img: '', + className: 'icon-task', alt: 'Task', action: function(event, element) { modeling.createShape({ @@ -93,11 +88,8 @@ BpmnPaletteProvider.prototype.getPaletteEntries = function(element) { }, 'add.subProcess-collapsed': { group: 'model-activity', - img: '' + - '', - alt: 'Subprocess collapsed', + className: 'icon-subprocess-collapsed', + alt: 'Sub-Process (collapsed)', action: function(event, element) { modeling.createShape({ type: 'bpmn:SubProcess', @@ -107,11 +99,8 @@ BpmnPaletteProvider.prototype.getPaletteEntries = function(element) { }, 'add.subProcess-expanded': { group: 'model-activity', - img: '' + - '', - alt: 'Subprocess Expanded', + className: 'icon-subprocess-expanded', + alt: 'Sub-Process (expanded)', action: function(event, element) { modeling.createShape({ type: 'bpmn:SubProcess', @@ -122,13 +111,4 @@ BpmnPaletteProvider.prototype.getPaletteEntries = function(element) { }); return actions; -}; - -BpmnPaletteProvider.prototype.open = function() { - this._palette.open(); -}; - - -BpmnPaletteProvider.prototype.close = function() { - this._palette.close(); -}; +}; \ No newline at end of file diff --git a/lib/features/palette/index.js b/lib/features/palette/index.js index 1323a9eb..d938465e 100644 --- a/lib/features/palette/index.js +++ b/lib/features/palette/index.js @@ -2,6 +2,6 @@ module.exports = { __depends__: [ require('diagram-js/lib/features/palette') ], - __init__: [ 'bpmnPaletteProvider' ], - bpmnPaletteProvider: [ 'type', require('./BpmnPaletteProvider') ], + __init__: [ 'paletteProvider' ], + paletteProvider: [ 'type', require('./PaletteProvider') ], }; diff --git a/test/spec/features/palette/BpmnPaletteProviderSpec.js b/test/spec/features/palette/BpmnPaletteProviderSpec.js deleted file mode 100644 index 0cf69766..00000000 --- a/test/spec/features/palette/BpmnPaletteProviderSpec.js +++ /dev/null @@ -1,50 +0,0 @@ -'use strict'; - -var Matchers = require('../../../Matchers'), - TestHelper = require('../../../TestHelper'); - - -var fs = require('fs'); - -var Modeler = require('../../../../lib/Modeler'); -var bpmnPaletteModule = require('../../../../lib/features/palette'); - - - -describe('palette', function() { - - - beforeEach(Matchers.addDeepEquals); - - - var container; - - beforeEach(function() { - container = jasmine.getEnv().getTestContainer(); - }); - - - function createModeler(xml, done) { - var modeler = new Modeler({ container: container }); - - modeler.importXML(xml, function(err) { - done(err, modeler); - }); - } - - it('should should draw palette', function(done) { - - var modeler = new Modeler({ container: container }); - modeler.createDiagram(function(err) { - - var palette = modeler.get('bpmnPaletteProvider'); - - palette.open(); - - done(err); - }); - }); - - - -}); diff --git a/test/spec/features/palette/PaletteProviderSpec.js b/test/spec/features/palette/PaletteProviderSpec.js new file mode 100644 index 00000000..aab1e9e5 --- /dev/null +++ b/test/spec/features/palette/PaletteProviderSpec.js @@ -0,0 +1,40 @@ +'use strict'; + +var TestHelper = require('../../../TestHelper'); + +var Modeler = require('../../../../lib/Modeler'); + +var $ = require('jquery'); + + +describe('palette', function() { + + var container; + + beforeEach(function() { + container = jasmine.getEnv().getTestContainer(); + }); + + + it('should should draw palette', function(done) { + + var modeler = new Modeler({ container: container }); + modeler.createDiagram(function(err) { + + // assume + var provider = modeler.get('paletteProvider'); + + // then + expect(provider).toBeTruthy(); + + // when + var paletteElement = $(container).find('.djs-palette'); + + // then + expect(paletteElement.find('.entry').length).toBe(7); + + done(err); + }); + }); + +});