opensource/bpmn-js
1
0
Fork 0
mirror of https://github.com/bpmn-io/bpmn-js.git synced 2025-08-16 21:01:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(label-editing): deselect element during editing

Browse Source
This commit is contained in:
Nico Rehwaldt
2014-09-15 14:42:43 +02:00
parent 4428be4227
commit 66c7a31d34
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/features/label-editing/LabelEditingProvider.js
View File

@ -16,7 +16,7 @@ var MIN_BOUNDS = {
}; };
function LabelEditingProvider(eventBus, canvas, directEditing, commandStack) { function LabelEditingProvider(eventBus, canvas, directEditing, commandStack, injector) {
directEditing.registerProvider(this); directEditing.registerProvider(this);
commandStack.registerHandler('element.updateLabel', UpdateLabelHandler); commandStack.registerHandler('element.updateLabel', UpdateLabelHandler);
@ -40,10 +40,37 @@ function LabelEditingProvider(eventBus, canvas, directEditing, commandStack) {
directEditing.complete(); directEditing.complete();
}); });
// remove and restore selection during direct editing
(function() {
try {
var selection = injector.get('selection');
var localSelection;
eventBus.on('directEditing.activate', function() {
localSelection = selection.get();
selection.select(null);
});
eventBus.on('directEditing.deactivate', function() {
selection.select(localSelection);
localSelection = null;
});
} catch (e) { }
})();
this._canvas = canvas; this._canvas = canvas;
this._commandStack = commandStack; this._commandStack = commandStack;
} }
LabelEditingProvider.$inject = [ 'eventBus', 'canvas', 'directEditing', 'commandStack', 'injector' ];
module.exports = LabelEditingProvider;
LabelEditingProvider.prototype.activate = function(element) { LabelEditingProvider.prototype.activate = function(element) {
@ -112,9 +139,4 @@ LabelEditingProvider.prototype.update = function(element, newLabel) {
element: element, element: element,
newLabel: newLabel newLabel: newLabel
}); });
}; };
LabelEditingProvider.$inject = [ 'eventBus', 'canvas', 'directEditing', 'commandStack' ];
module.exports = LabelEditingProvider;

2
lib/features/modeling/LabelSupport.js
View File

@ -42,7 +42,7 @@ function LabelSupport(eventBus, modeling, bpmnFactory) {
var label = element.label; var label = element.label;
if (label && dragContext.shapes.indexOf(label) === -1) { if (label && !label.hidden && dragContext.shapes.indexOf(label) === -1) {
dragContext.shapes.push(label); dragContext.shapes.push(label);
} }
}); });