From 18784c5994a33c78170d73e3bff42c3a1d21c70a Mon Sep 17 00:00:00 2001
From: Nico Rehwaldt <git_nikku@nixis.de>
Date: Wed, 17 Dec 2014 21:54:25 +0100
Subject: [PATCH] fix(label-editing): listen to correct events

---
 .../label-editing/LabelEditingProvider.js      | 11 +++--------
 .../label-editing/LabelEditingProviderSpec.js  | 18 +++++++++---------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/lib/features/label-editing/LabelEditingProvider.js b/lib/features/label-editing/LabelEditingProvider.js
index 588c3a05..c07ad8ce 100644
--- a/lib/features/label-editing/LabelEditingProvider.js
+++ b/lib/features/label-editing/LabelEditingProvider.js
@@ -21,18 +21,13 @@ function LabelEditingProvider(eventBus, canvas, directEditing, commandStack, inj
   directEditing.registerProvider(this);
   commandStack.registerHandler('element.updateLabel', UpdateLabelHandler);
 
-  // per default, listen to double click events
-  eventBus.on('shape.dblclick', function(event) {
-    directEditing.activate(event.element);
-  });
-
-  // per default, listen to double click events
-  eventBus.on('connection.dblclick', function(event) {
+  // listen to dblclick on non-root elements
+  eventBus.on('element.dblclick', function(event) {
     directEditing.activate(event.element);
   });
 
   // intercept direct canvas clicks to deselect all selected shapes
-  eventBus.on('canvas.click', function(event) {
+  eventBus.on('element.click', function(event) {
     directEditing.complete();
   });
 
diff --git a/test/spec/features/label-editing/LabelEditingProviderSpec.js b/test/spec/features/label-editing/LabelEditingProviderSpec.js
index e284ac25..0275be73 100644
--- a/test/spec/features/label-editing/LabelEditingProviderSpec.js
+++ b/test/spec/features/label-editing/LabelEditingProviderSpec.js
@@ -37,7 +37,7 @@ describe('features - label-editing', function() {
       var shape = elementRegistry.get('task-nested-embedded');
 
       // when
-      eventBus.fire('shape.dblclick', { element: shape });
+      eventBus.fire('element.dblclick', { element: shape });
 
       // then
       expect(directEditing.isActive()).toBe(true);
@@ -53,7 +53,7 @@ describe('features - label-editing', function() {
       var oldName = task.name;
 
       // activate
-      eventBus.fire('shape.dblclick', { element: shape });
+      eventBus.fire('element.dblclick', { element: shape });
 
       // a jQuery <textarea /> element
       var textarea = directEditing._textbox.textarea;
@@ -69,14 +69,14 @@ describe('features - label-editing', function() {
     }));
 
 
-    it('should submit on <canvas.click>', inject(function(elementRegistry, directEditing, eventBus) {
+    it('should submit on root element click', inject(function(elementRegistry, directEditing, canvas, eventBus) {
 
       // given
       var shape = elementRegistry.get('task-nested-embedded'),
           task = shape.businessObject;
 
       // activate
-      eventBus.fire('shape.dblclick', { element: shape });
+      eventBus.fire('element.dblclick', { element: shape });
 
       var newName = 'new value';
 
@@ -86,7 +86,7 @@ describe('features - label-editing', function() {
       // when
       // change + <canvas.click>
       textarea.val(newName);
-      eventBus.fire('canvas.click', {});
+      eventBus.fire('element.click', { element: canvas.getRootElement() });
 
       // then
       expect(directEditing.isActive()).toBe(false);
@@ -110,9 +110,9 @@ describe('features - label-editing', function() {
 
   function directEditActivate(element) {
     if (element.waypoints) {
-      eventBus.fire('connection.dblclick', { element: element });
+      eventBus.fire('element.dblclick', { element: element });
     } else {
-      eventBus.fire('shape.dblclick', { element: element });
+      eventBus.fire('element.dblclick', { element: element });
     }
   }
 
@@ -183,7 +183,7 @@ describe('features - label-editing', function() {
 
       var listenerCalled;
 
-      eventBus.on('shape.changed', function(e) {
+      eventBus.on('element.changed', function(e) {
         if (e.element === diagramElement) {
           listenerCalled = true;
         }
@@ -205,7 +205,7 @@ describe('features - label-editing', function() {
 
       var listenerCalled;
 
-      eventBus.on('shape.changed', function(e) {
+      eventBus.on('element.changed', function(e) {
         if (e.element === diagramElement.label) {
           listenerCalled = true;
         }