Commit Graph

684 Commits

Author SHA1 Message Date
Nico Rehwaldt 53a701da93 fix(context-pad): use correct icon 2015-05-12 15:25:35 +02:00
Nico Rehwaldt bd2a4dd16b fix(rules): connect message flow to message/untyped events only
Closes #261
2015-05-12 14:35:21 +02:00
Nico Rehwaldt a70778880f chore(palette+context-pad): update tooltips
Related to #259
2015-05-11 17:36:01 +02:00
Nico Rehwaldt 7b712d8428 feat(modeling): add feedback on invalid modeling action
This commit adds the ModelingFeedback component. It hooks into
modeling action rejected events and displays error messages
to the user.

The current behavior is to show an error message when dropping
a flow node outside a participant in a collaboration.

Related to #203
2015-05-11 17:01:48 +02:00
Nico Rehwaldt bacd2b4322 feat(keyboard): add direct editing -> e binding
Related to #243
2015-05-06 18:09:13 +02:00
Nico Rehwaldt d54ee97aa1 feat(keyboard): add tooling specific key bindings
* space tool -> [s]
* multi select -> [m]

related to bpmn-io/bpmn-js#244
2015-05-06 17:36:46 +02:00
Nico Rehwaldt f0f475dad5 feat(palette): integrate multi selection + space tool
related to #244
2015-05-06 16:52:33 +02:00
Nico Rehwaldt 4f236382a0 fix(modeling): adjust default size for participants
From 600x300 -> 600x250.

Closes #262
2015-05-06 16:51:01 +02:00
Ricardo Matias 6fc512b477 feat(resize): snap to minimum bounds during resize
closes #252
2015-05-04 15:32:36 +02:00
Ricardo Matias 6f8999b8ae fix(modeling/BpmnUpdater): restore children di when changing diagram type
closes #253
2015-05-04 15:08:32 +02:00
Nico Rehwaldt 7a54267536 fix(replace): remove unused modeling dependency
The modeling module should be provided by components explicitly.

This allows users to replace it for customization.
2015-04-30 11:40:05 +02:00
Nico Rehwaldt cb52a479e0 fix(palette): add missing create feature 2015-04-30 11:33:27 +02:00
Nico Rehwaldt af9ce652e2 feat(snapping): snap to source element
This ensures we snap to a source element if one is provided, i.e. during
shape.append.
2015-04-29 15:04:54 +02:00
Nico Rehwaldt b233ab957c feat(snapping): add bpmn-specific move snapping
This commit adds message flow + collaboration specific snapping by
subclassing the diagram-js provided default Snapping implementation.

* Add collaboration snapping
* Rename lib/util/{Name}.js -> lib/util/{Name}Util.js

Closes #255
2015-04-29 15:04:54 +02:00
Nico Rehwaldt d8ef4772cd chore(modeling): make append behavior a CommandInterceptor
Append behavior inherits from CommandInterceptor now.

Connection type inference related code is reused from Modeling#connect.
2015-04-28 14:13:54 +02:00
Nico Rehwaldt 183a41cf26 fix(modeling): convert to process when deleting last participant only
Related to #128
2015-04-28 14:13:54 +02:00
Nico Rehwaldt 6eceb0926b feat(layout): add straight layouting for message flows
This commit adds a straight layouting strategy for message flows.
Other than that it makes sure connection attachments are being
remembered during reconnection / shape move.

Closes #249
Closes #179
2015-04-22 16:19:26 +02:00
Nico Rehwaldt 087506cc9a feat(modeling): transform message <> sequence flows
Closes #199
2015-04-22 16:12:58 +02:00
Nico Rehwaldt c14a87e5ad feat(modeling): add message flow modeling
Related to #199
Closes #201
2015-04-22 16:12:58 +02:00
Nico Rehwaldt de648520d5 feat(modeling): snap initial participant to diagram contents
Closes #241
2015-04-16 18:30:04 +02:00
Ricardo Matias 0381811d03 feat(space-tool): add create/remove space behaviour
closes #132
2015-04-16 10:00:18 +02:00
Nico Rehwaldt 0a03e59866 feat(modeling): add participant modeling behavior
This commit adds the ability to model participants from the palette.

* Empty diagrams can be used as a start for participant _AND_ process diagram
* Process diagrams can be converted to collaboration diagrams by dropping
  a participant onto them

Closes #128
2015-04-14 15:23:16 +02:00
Nico Rehwaldt 2e73f5ab85 fix(modeling): update id property in diagram-js, too
This fixes a bug where updating the id property of an element
was not propagated to the diagram. Thus, retrieving the element
based on the new id from diagram-js did not work.

Closes #238
2015-04-13 10:55:17 +02:00
jdotzki 8cd3c78d5e fix(rule): allow drop of associations
close #202
2015-03-25 13:45:54 +01:00
Nico Rehwaldt e7bbb5d6bf chore(project): use inherits util 2015-03-23 15:15:32 +01:00
Nico Rehwaldt 695a973e92 chore(modeling): renamve behaviors for clarity 2015-03-23 15:14:54 +01:00
Nico Rehwaldt e06fb32ad2 fix(style): remove trailing comma 2015-03-13 10:39:22 +01:00
Nico Rehwaldt 397a4aeea5 fix(replace): keep associations during replace
Closes #226
2015-03-12 14:03:28 +01:00
Nico Rehwaldt ae8e6146d1 chore(project): fix whitespace character 2015-03-11 17:42:56 +01:00
Nico Rehwaldt 1c0ade9d51 feat(replace): focus element after replace
Related to #192
2015-03-11 16:31:42 +01:00
Nico Rehwaldt 67d81c346c fix(replace): pre-build BPMN elements
This simplifies the ways we work with replacements.

Instead of monkey-patching the original replace functionality we

* create the business object / target object
* pass it to replace

A simple way that works well with our existing infrastructure.

Other changes:

* fixes redo / undo issues.
* splits context-pad + replace

Closes #180
2015-03-11 16:19:09 +01:00
Nico Rehwaldt d1d42f3713 chore(project): upgrade to latest bpmn-font 2015-03-10 16:07:58 +01:00
jdotzki 2b8d8110fd fix(contextpad): prevent replace menu from opening multiple instances 2015-03-08 11:51:38 +01:00
jdotzki 2321caecd7 improve(contextpad): remove modeling options behind throwing link events
related #219
2015-03-07 12:59:22 +01:00
jdotzki 6aceab9dbf feature(contextpad): add catch events to pad for event based gateways
close #206
2015-03-06 09:27:18 +01:00
jdotzki e665895448 improve(font): update to latest font
#186
2015-03-05 18:04:57 +01:00
jdotzki 89a3a6bcd8 feature(modeling): set di.isMarkerVisible for exclusive gateway as default
close #221
2015-03-05 14:19:47 +01:00
jdotzki c5af54c1e3 feature(rules): add rule for link events
close #219
2015-03-05 13:57:32 +01:00
jdotzki 6f85d3081f improve(contextpad): use receive-task icon instead just receive
close #214
2015-03-04 15:50:06 +01:00
jdotzki 7676b9f244 fix(context pad): correct position of replace menu
close #210
2015-03-04 15:27:13 +01:00
jdotzki 1c45d98f9a fix(contextpad): add missing events to replace menu
close #209
close #217
2015-03-04 12:28:18 +01:00
jdotzki 225cbb914c fix(rules): fix modeling rules for event based gateways
Allow  condition and signal catching events after event based gateways.

close #213
2015-03-04 10:20:37 +01:00
jdotzki f527096ac2 fix(contextpad): add signal event to end event replace menu
close #211 #218
2015-03-03 17:09:54 +01:00
jdotzki 5604e13468 fix(contextpad): remove incorrect replace targets
close #207
2015-03-03 15:58:59 +01:00
jdotzki 73c6c883c5 fix(replace): run model updates on 'execute'
close bpmn-io/bpmn-js#213
2015-03-03 15:52:40 +01:00
jdotzki 22c0065d5d fix(context pad): remove instantiating gateways from replace menu
close #212
2015-03-03 15:15:00 +01:00
jdotzki 7207d010db feat(contextpad): add event to replace-menu
See #192
2015-03-02 13:43:06 +01:00
jdotzki 66801df111 feature(rules): add modeling rules for event based gateways
closes #193
2015-03-02 13:43:06 +01:00
jdotzki 18c2b0552e feat(contextpad): add replace-menu to context pad
Support for Gateways and Task Types was added.

See #130
2015-03-02 13:43:06 +01:00
jdotzki 3873709141 feat(replace): add service that allows to replace elements
API
- BpmnReplace#replaceElement

see bpmn-io/bpmn-js#130
2015-03-02 13:43:06 +01:00
Nico Rehwaldt 3996408404 chore(project): migrate to modularized lodash@3
* use specialized lodash utilities
* consistently apply 'use strict'

Related to #185
2015-02-02 14:46:21 +01:00
Nico Rehwaldt a899df2a12 chore(modeling/rules): reduce complexity
Related to #176
2015-01-29 14:03:17 +01:00
jdotzki d8057a2acc fix(rules): disallow circular connection
This temporarily disallows connections from and to the same element
because it rendered the connection unusable..

This change can be reverted once proper auto layout for circular connections is implemented.

Closes #176
2015-01-29 13:26:32 +01:00
Nico Rehwaldt 85e512c97d feat(modeler): add bendpoints
It is now possible to add bendpoints to flows or drag bendpoints to
update their position / trigger reconnects.

Upon bendpoint move a rule is checked to figure out whether or not a
bendpoint operation is allowed or not.

Closes #123
Closes #138
Closes #139
Closes #165
2015-01-20 17:19:56 +01:00
Nico Rehwaldt 39d5fa2e9c feat(modeling): inherit default handlers 2015-01-06 16:28:39 +01:00
Nico Rehwaldt 2019c658df feat(modeling): add property update mechanism
This adds the modeling#updateProperties(element, props) method to the
modeler that can be used to set BPMN 2.0 properties on elements.

By assigning the properties this way, the modeler is aware of the
elements that got changed and can update / redraw the elements
accordingly.

This hooks up with the modelers undo/redo chain, too.

Related to #167
2015-01-02 16:15:18 +01:00
Nico Rehwaldt 2909847ac8 feat(direct-editing): rework editing
This commit updates the default direct editing behavior.

It activates on non-touch environments only and only on embedded
labels, too.

This provides a way smoother modeling experience.
2014-12-23 16:56:35 +01:00
Nico Rehwaldt 355059c30a feat(modelling): unify drag/drop handling from palette/context-pad
Related to bpmn-io/diagram-js#60
2014-12-23 16:56:35 +01:00
jdotzki 1dd19fdb0d fix(contextpad): different handling for deletion of shapes and connections
See bpmn-io/bpmn-js#121
2014-12-23 14:24:34 +01:00
Nico Rehwaldt 18784c5994 fix(label-editing): listen to correct events 2014-12-17 21:55:03 +01:00
Nico Rehwaldt 429a903dd5 style(*): fix jshint warnings 2014-12-07 15:10:02 +01:00
Nico Rehwaldt 6041717c6c feat(modeling): implement create via palette/context-pad
Related to #137
2014-12-07 13:08:50 +01:00
Nico Rehwaldt e387768ef1 fix(modeling): use correct parent for bpmn:TextAnnotation 2014-12-02 08:36:15 +01:00
Nico Rehwaldt 9e37037ac6 fix(move): adjust positioning of all attached labels 2014-11-28 11:38:06 +01:00
Nico Rehwaldt 3af41e2e7e fix(rules): restrict movement on flow elements only
For the moment we allow moving flow elements in between diagrams, only.
2014-11-27 11:56:31 +01:00
Nico Rehwaldt 2258642cb4 fix(modeling): skip updating BPMN parent on label move 2014-11-27 11:55:38 +01:00
Nico Rehwaldt 2f679a36b9 feat(modeling): move to rules infrastructure
Related to bpmn-io/diagram-js#55
2014-11-21 09:22:51 +01:00
jdotzki 51918b3493 feat(drop): basic implementation
This commit adds a basic implementation for model drop

* using rules to check whether the drop is allowed
* updating the model after drop

See #127
2014-11-21 09:21:41 +01:00
Nico Rehwaldt 0b8baccd32 feat(palette): migrate to icon font
Related to #148
2014-11-17 18:26:07 +01:00
Nico Rehwaldt b1f310a1db feat(context-pad): use font to render symbols
Related to #148
2014-11-17 11:02:25 +01:00
Nico Rehwaldt c58532aeac chore(import): reorganize import related functionality
This commit puts all import related stuff into the import module.

The core module remains as an entry point to require the basic modules
needed by bpmn-js. At the time this is { import, draw }.
2014-10-30 12:06:43 +01:00
jdotzki 86f66bc534 improve(resize): allow to set minimum size for element 2014-10-14 17:26:50 +02:00
jdotzki 1e224370e2 improve(resize): restrict resizable elements
related bpmn-io/bpmn-js#140
2014-10-14 09:12:03 +02:00
jdotzki 392dfaee41 feat(resize): add ability to resize shapes
see #140
2014-10-10 09:06:21 +02:00
jdotzki 4ab6c472df fix(bpmnpaletteprovider): workaround for incorrect layouting of connections
The layout algorithm is broken for decimal coordinates see #143
This is a workaround to not trigger the bug when using the palette.
2014-10-08 11:38:01 +02:00
jdotzki 5633dc0b78 improve(elementfactory): changed default size for SubProcesses
- expanded: with enough space for a small process
- collapsed: same size as Tasks
2014-10-07 11:54:21 +02:00
jdotzki 0ffdbb7fbb fix(bpmnpaletteprovider): change , to ;
related #141
2014-10-06 15:46:26 +02:00
jdotzki d3dbeb1375 feat(bpmnpaletteprovider): BPMN item provider for the palette
close bpmn-js#137
2014-10-06 12:23:22 +02:00
Nico Rehwaldt 36cb6777ce fix(modeling): disallow connection -> startEvent 2014-09-15 16:01:09 +02:00
Nico Rehwaldt 66c7a31d34 chore(label-editing): deselect element during editing 2014-09-15 14:42:43 +02:00
Nico Rehwaldt 8cc530bf58 feat(modeling): move external labels with nodes
Closes #105
2014-09-11 17:22:59 +02:00
Nico Rehwaldt eaddbb31c4 feat(context-pad): add visual creation of connections
Closes #107
2014-09-11 16:44:56 +02:00
Nico Rehwaldt a1044e2784 fix(label-editing): correctly compute direct-editing bbox
Closes #115
2014-09-09 15:21:21 +02:00
Nico Rehwaldt 0044a51bc5 feat(label-editing): auto hide empty labels
Related to #105
2014-09-09 15:20:30 +02:00
Nico Rehwaldt 9d16e17c5c fix(labels): correct positioning + hide if empty
This commit improves the label handling by

* showing the label only if it exists
* updating the status accordingly
* positioning the label correctly on import

Related to #113
2014-09-08 19:03:39 +02:00
Nico Rehwaldt d0644c953a feat(modeling): integrate connection repair 2014-09-04 13:47:31 +02:00
Nico Rehwaldt 7e5f4eba14 fix(context-pad): make all bpmn elements deletable
Related to #118
2014-09-04 13:47:31 +02:00
jdotzki e487d6d811 feat(context-pad): add delete button
See #118
2014-08-29 16:03:08 +02:00
Nico Rehwaldt 2c5548423b chore(modeling): remove custom shape.append handler 2014-08-28 17:38:51 +02:00
Nico Rehwaldt a301acc4c4 feat(modeling): integrate connection.move
Related to #125
2014-08-28 16:17:55 +02:00
Nico Rehwaldt c685c0fcce feat(project): add manhattan style layouting for flows
Related to #48
2014-08-27 16:55:26 +02:00
Nico Rehwaldt 969c882946 fix(context-pad): correct end-event entry sizing 2014-08-27 15:50:40 +02:00
Nico Rehwaldt 5a2c5c425c chore(navigation): move features to diagram-js
This commit moves the navigation features from bpmn-js to diagram-js so
that they can be reused in other modeling / viewer tools.

Related to #124

BREAKING CHANGE:

Navigation features have been moved to diagram-js. If you use them in
custom bundles, update their location accordingly:

bpmn-js/lib/features/movecanvas -> diagram-js/lib/navigation/movecanvas
bpmn-js/lib/features/zoomscroll -> diagram-js/lib/navigation/zoomscroll
bpmn-js/lib/features/touch -> diagram-js/lib/navigation/touch
2014-08-27 15:43:18 +02:00
jdotzki 470e0f88ba feat(modeling): update bpmn model on remove
On removeShape/removeConnection the BPMN model is updated accordingly.

related to #106
2014-08-22 15:20:48 +02:00
Nico Rehwaldt 86d5c20f07 fix(modeling): strip all namespaces for semantic id generation
Related to #108
2014-08-12 11:03:47 +02:00
jdotzki 58b9964828 improve(bpmnfactory): add semantic element IDs
The ID will have an semantic prefix: SequenceFlow_6bpz90i

related to bpmn-io/bpmn-js#108
2014-08-11 17:55:54 +02:00
Nico Rehwaldt fb86037cdd fix(modeling): properly update sourceRef/targetRef for associations
Related to #90
2014-08-05 17:57:19 +02:00
Nico Rehwaldt a8d51a849d fix(modeling): add missing $inject 2014-08-05 17:35:54 +02:00
jdotzki c67709ce34 feat(modeling): allow append TextAnnotation
Closes #90
2014-08-05 17:21:49 +02:00
Nico Rehwaldt 4a824911c2 feat(modeling): validate + create unique ids
This adds id logging + validation to the Modeler. As a result the
modeler will throw hard exeptions on colliding id mappings and may
generated unique ids.

Related to bpmn-io/bpmn-js#92
2014-08-04 16:34:37 +02:00
Nico Rehwaldt 925fbc98b8 chore(project): pull bpmn-moddle changes 2014-08-04 16:32:11 +02:00
Nico Rehwaldt 9e2ad175df chore(label-editing): integrate into modeling 2014-08-04 09:34:46 +02:00
Nico Rehwaldt b1663db035 fix(modeling): correct initial label positioning 2014-08-04 09:34:45 +02:00
Nico Rehwaldt 11f166a7f9 fix(modeling): update di bounds during shape.create 2014-08-04 09:34:44 +02:00
Nico Rehwaldt 4af334259c fix(context-pad): create ExclusiveGateway 2014-08-04 09:34:43 +02:00
Nico Rehwaldt 6183fc2561 chore(modeling): clean unused import 2014-08-04 09:32:49 +02:00
Nico Rehwaldt 209a86dc71 fix(modeling): correct size for gateways 2014-08-04 09:32:48 +02:00
jdotzki 9a19927a97 feat(context pad): add intermediate throw event to context pad
close #89
2014-08-01 16:21:16 +02:00
Nico Rehwaldt 72729ce248 fix(modeling/BpmnFactory): do not serialize point#original 2014-08-01 08:32:56 +02:00
Nico Rehwaldt 44d2d94ed2 fix(modeling): create di before rendering 2014-07-31 16:26:06 +02:00
Nico Rehwaldt 4afe3a80ed feat(modeling): crop connections on shape boundaries
Behind the scenes changes:

* use diagram-js Matcher util in tests
* add test cases for LayoutConnection
* add test cases for CreateConnection
* cleanup unused test diagram

Related to #2
2014-07-31 16:26:05 +02:00
Nico Rehwaldt 7347e484ba chore(command): pull diagram-js changes 2014-07-31 15:58:31 +02:00
Nico Rehwaldt bc61e6c3ed feat(features/modeling): implement BPMN update for shape+label move
Related to #2
2014-07-31 15:58:28 +02:00
Nico Rehwaldt 9456ca9098 feat(features/modeling): assign default size for elements 2014-07-31 15:57:15 +02:00
Nico Rehwaldt d729818b94 feat(features/modeling): implement bpmn update as command listeners
This commit adds

* handling of bpmn update as command listeners
* label support

Related to bpmn-io/diagram-js#45

BREAKING CHANGE:

* rename bpmnModeling -> modeling to achive parity with diagram-js
2014-07-31 15:56:15 +02:00
jdotzki e1ed479314 feat(modeling): model gateways in processes
- Gateways can added via context pad
- BpmnModelingSpec.js split up into several files

See #88
2014-07-31 14:03:33 +02:00
Nico Rehwaldt f02b741c85 feat(features/context-pad): focus elements after append 2014-07-18 15:29:41 +02:00
Nico Rehwaldt 1947a9c4de fix(features/bpmn-modeling): correctly remove flow from outgoing/incoming
Related to #6
2014-07-18 15:10:33 +02:00
Nico Rehwaldt f1b023f419 fix(features/bpmn-modeling): reuse created elements during redo
This commit fixes the append node command by caching and reusing created
shapes and bpmn elements.

This ensures we do not invalidate actions that build on these element
references.

Related to #6
2014-07-18 14:39:15 +02:00
Nico Rehwaldt 0bb2f9c1ed fix(features/context-pad): remove dangling fs 2014-07-18 08:52:47 +02:00
Nico Rehwaldt 894280e723 feat(feature/bpmn-modeling): append task via context-pad
Related to #6, #40
2014-07-17 15:29:34 +02:00
Nico Rehwaldt 4fe5bbc0f5 feat(features/bpmn-modeling): implement appendNode
Related to #6
2014-07-17 14:11:28 +02:00
Nico Rehwaldt 5185c55f68 chore(features/label-editing): directly depend on cmd
Related to bpmn-io/diagram-js#41
2014-07-17 14:08:15 +02:00
Nico Rehwaldt f380a4b044 feat(lib/core): use directly linked data-model
Closes #91
2014-07-17 14:08:15 +02:00
Nico Rehwaldt 4fb8a04251 Merge branch 'tap' 2014-07-17 13:22:46 +02:00
jdotzki 7e73e9d7c9 feat(features/label-editing): add touch based editing
Closes #84
2014-07-17 13:20:59 +02:00
jdotzki a5668bfac7 refactor(zoomscroll): use layerX/Y instead more sophisticated solution.
As long as we use a container with relative positioning this should work.

close #83
2014-07-09 16:35:57 +02:00
jdotzki 75402fe277 fix(zoomscroll): fix using of incorrect offsetX/Y values for zoom on Gecko Browsers
close #83
2014-07-09 15:08:19 +02:00
jdotzki 3c7033f92e feat(features/touch): add touch gesture support
Allow to navigate i.e. scroll/zoom on the diagram via touch gestures.

Closes #46
2014-06-27 14:24:29 +02:00
Nico Rehwaldt 17329666f9 fix(LabelEditingProvider): work around old WebKit incompatibility 2014-06-24 15:34:57 +02:00
Nico Rehwaldt 84510cc45d feat(label-editing): edit all labels
Related to #7
2014-06-17 11:53:07 +02:00
Nico Rehwaldt 42b14c97e2 feat(bower): use exposify to build bower bundle
This commit uses exposify to perform a quick replace on web dependency
require() statements before browserify can process them.

This way we access our external dependencies (jquery, lodash, snapsvg,
sax) via window globals in a standalone bower bundle.

Closes #63
2014-06-13 16:55:31 +02:00
Nico Rehwaldt 73fbeb3d27 feat(modeler): add label editing
Related to #7
2014-06-11 15:08:45 +02:00
Nico Rehwaldt 4e00114409 chore(project): upgrade to new diagram.js module structure 2014-06-11 14:41:55 +02:00