cpee 2.1.91 → 2.1.92

data/cockpit/themes/control/theme.js

@@ -76,47 +76,47 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Closed Loop',
          'function_call': func,
-         'menu_icon': self.elements.closed_loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.closed_loop.illustrator.svg),
          'type': 'closed_loop',
          'params': [self.adaptor.description.elements.closed_loop, node]},
         {'label': 'Terminate',
          'function_call': func,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.terminate.illustrator.svg),
          'type': 'terminate',
          'params': [self.adaptor.description.elements.terminate, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
@@ -124,7 +124,7 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
         childs.push({
            'label': 'Critical',
            'function_call': func,
-           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.critical.illustrator.svg),
            'type': 'critical',
            'params': [self.adaptor.description.elements.critical, node]
         });
@@ -137,54 +137,54 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       if(node.parents('parallel').length > node.parents('parallel_branch').length && node.get(0).tagName == 'alternative') {
         return [{'label': 'Parallel Branch',
          'function_call': func,
-         'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel_branch.illustrator.svg),
          'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]}];
       }
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Closed Loop',
          'function_call': func,
-         'menu_icon': self.elements.closed_loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.closed_loop.illustrator.svg),
          'type': 'closed_loop',
          'params': [self.adaptor.description.elements.closed_loop, node]},
         {'label': 'Terminate',
          'function_call': func,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.terminate.illustrator.svg),
          'type': 'terminate',
          'params': [self.adaptor.description.elements.terminate, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
@@ -192,7 +192,7 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
         childs.push({
            'label': 'Critical',
            'function_call': func,
-           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.critical.illustrator.svg),
            'type': 'critical',
            'params': [self.adaptor.description.elements.critical, node]
         });
@@ -206,42 +206,42 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Closed Loop',
          'function_call': func,
-         'menu_icon': self.elements.closed_loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.closed_loop.illustrator.svg),
          'type': 'closed_loop',
          'params': [self.adaptor.description.elements.closed_loop, node]},
         {'label': 'Terminate',
          'function_call': func,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.terminate.illustrator.svg),
          'type': 'terminate',
          'params': [self.adaptor.description.elements.terminate, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
@@ -249,7 +249,7 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
         childs.push({
            'label': 'Critical',
            'function_call': func,
-           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.critical.illustrator.svg),
            'type': 'critical',
            'params': [self.adaptor.description.elements.critical, node]
         });
@@ -257,14 +257,14 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       if(node.parent('parallel').length > node.parent('parallel_branch').length) {
         childs.push({'label': 'Parallel Branch',
                      'function_call': func,
-                     'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
+                     'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel_branch.illustrator.svg),
                      'type': 'parallel_branch',
                      'params': [self.adaptor.description.elements.parallel_branch, node]}
                     );
       } else {
         childs.push({'label': 'Parallel',
                      'function_call': func,
-                     'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+                     'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
                      'type': 'parallel',
                      'params': [self.adaptor.description.elements.parallel, node]}
                     );
@@ -278,44 +278,44 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var childs =  [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Closed Loop',
          'function_call': func,
-         'menu_icon': self.elements.closed_loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.closed_loop.illustrator.svg),
          'type': 'closed_loop',
          'params': [self.adaptor.description.elements.closed_loop, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
       if(node.get(0).tagName != 'parallel')
         childs.push({'label': 'Parallel',
            'function_call': self.adaptor.description.insert_last_into,
-           'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
            'type': 'parallel',
            'params': [self.adaptor.description.elements.parallel, node]});
       return childs;
@@ -327,59 +327,59 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Closed Loop',
          'function_call': func,
-         'menu_icon': self.elements.closed_loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.closed_loop.illustrator.svg),
          'type': 'closed_loop',
          'params': [self.adaptor.description.elements.closed_loop, node]},
         {'label': 'Terminate',
          'function_call': func,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.terminate.illustrator.svg),
          'type': 'terminate',
          'params': [self.adaptor.description.elements.terminate, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.critical.illustrator.svg),
          'type': 'critical',
          'params': [self.adaptor.description.elements.critical, node]}
       ];
       if(node.parents('choose').length > node.parents('alternative, otherwise').length && node.get(0).tagName == 'parallel_branch') {
         return [{'label': 'Alternative',
          'function_call': func,
-         'menu_icon': self.elements.alternative.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.alternative.illustrator.svg),
          'type': 'alternative',
          'params': [self.adaptor.description.elements.alternative, node]}];
       }
@@ -392,47 +392,47 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Closed Loop',
          'function_call': func,
-         'menu_icon': self.elements.closed_loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.closed_loop.illustrator.svg),
          'type': 'closed_loop',
          'params': [self.adaptor.description.elements.closed_loop, node]},
         {'label': 'Terminate',
          'function_call': func,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.terminate.illustrator.svg),
          'type': 'terminate',
          'params': [self.adaptor.description.elements.terminate, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
@@ -440,7 +440,7 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
         childs.push({
            'label': 'Critical',
            'function_call': func,
-           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.critical.illustrator.svg),
            'type': 'critical',
            'params': [self.adaptor.description.elements.critical, node]
         });
@@ -454,42 +454,42 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Closed Loop',
          'function_call': func,
-         'menu_icon': self.elements.closed_loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.closed_loop.illustrator.svg),
          'type': 'closed_loop',
          'params': [self.adaptor.description.elements.closed_loop, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
@@ -497,7 +497,7 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
         childs.push({
            'label': 'Critical',
            'function_call': func,
-           'menu_icon': self.elements.critical.illustrator.svg.clone(),
+           'menu_icon': contextMenuHandling_clean_icon(self.elements.critical.illustrator.svg),
            'type': 'critical',
            'params': [self.adaptor.description.elements.critical, node]
         });
@@ -543,17 +543,17 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var childs =  [
         {'label': 'Measuring',
          'function_call': func,
-         'menu_icon': self.elements.closed_loop_measuring.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.closed_loop_measuring.illustrator.svg),
          'type': 'closed_loop_measuring',
          'params': [self.adaptor.description.elements.closed_loop_measuring, node]} ,
         {'label': 'Control',
          'function_call': func,
-         'menu_icon': self.elements.closed_loop_control.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.closed_loop_control.illustrator.svg),
          'type': 'closed_loop_control',
          'params': [self.adaptor.description.elements.closed_loop_control, node]},
         {'label': 'Cancel',
          'function_call': func,
-         'menu_icon': self.elements.closed_loop_cancel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.closed_loop_cancel.illustrator.svg),
          'type': 'closed_loop_cancel',
          'params': [self.adaptor.description.elements.closed_loop_cancel, node]}
       ];
@@ -605,37 +605,37 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
@@ -687,42 +687,42 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Control',
          'function_call': func,
-         'menu_icon': self.elements.closed_loop_control.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.closed_loop_control.illustrator.svg),
          'type': 'closed_loop_control',
          'params': [self.adaptor.description.elements.closed_loop_control, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];
@@ -764,37 +764,37 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
       var childs = [
         {'label': 'Service Call with Scripts',
          'function_call': func,
-         'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
          'function_call': func,
-         'menu_icon': self.elements.call.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.call.illustrator.svg),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Script',
          'function_call': func,
-         'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.manipulate.illustrator.svg),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Parallel',
          'function_call': func,
-         'menu_icon': self.elements.parallel.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.parallel.illustrator.svg),
          'type': 'parallel',
          'params': [self.adaptor.description.elements.parallel, node]},
         {'label': 'Decision',
          'function_call': func,
-         'menu_icon': self.elements.choose.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.choose.illustrator.svg),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
          'function_call': func,
-         'menu_icon': self.elements.loop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.loop.illustrator.svg),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
         {'label': 'Stop',
          'function_call': func,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'menu_icon': contextMenuHandling_clean_icon(self.elements.stop.illustrator.svg),
          'type': 'stop',
          'params': [self.adaptor.description.elements.stop, node]}
       ];