cockpit/themes/compact/theme.js in cpee-2.1.35 vs cockpit/themes/compact/theme.js in cpee-2.1.36

- old
+ new

@@ -309,14 +309,22 @@ var ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') } ]; return ret; }, 'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; }, 'resolve_symbol': function(node) { - if($('> code', node).length > 0) { - return 'callmanipulate'; + if ($('> annotations > _context_data_analysis > probes > probe', node).length > 0) { + if ($('> code', node).length > 0) { + return 'callmanipulate_sensor'; + } else { + return 'call_sensor'; + } } else { - return 'call'; + if ($('> code', node).length > 0) { + return 'callmanipulate'; + } else { + return 'call'; + } } }, 'svg': self.adaptor.theme_dir + 'symbols/call.svg' },//}}} 'description': self.adaptor.theme_dir + 'rngs/call.rng', @@ -1239,16 +1247,28 @@ }; /*}}}*/ // Abstract Elements // * they may only have an illustrator (or other parts) // * they HAVE TO have a parent + this.elements.call_sensor = { /*{{{*/ + 'parent': 'call', + 'illustrator': {//{{{ + 'svg': self.adaptor.theme_dir + 'symbols/call_sensor.svg' + }//}}} + }; /*}}}*/ this.elements.callmanipulate = { /*{{{*/ 'parent': 'call', 'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng', 'illustrator': {//{{{ - 'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; }, 'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg' - },//}}} + }//}}} + }; /*}}}*/ + this.elements.callmanipulate_sensor = { /*{{{*/ + 'parent': 'call', + 'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng', + 'illustrator': {//{{{ + 'svg': self.adaptor.theme_dir + 'symbols/callmanipulate_sensor.svg' + }//}}} }; /*}}}*/ this.elements.loop_head = { /*{{{*/ 'parent': 'loop', 'illustrator': {//{{{ 'endnodes': 'this',