cockpit/themes/extended/theme.js in cpee-1.4.32 vs cockpit/themes/extended/theme.js in cpee-1.5.0
- old
+ new
@@ -73,11 +73,11 @@
format_visual_forms();
}
}; //}}}
function copyOrMove(menu,group,xml_node,mode) { //{{{
- var markymark = self.marked();
+ var markymark = _.uniq(self.marked());
var check1 = [];
var check2 = [];
$(markymark).each(function(key,svgid){
var node = self.adaptor.description.get_node_by_svg_id(svgid);
check1.push($(node).attr('svg-type'));
@@ -502,11 +502,11 @@
var childs = [{'label': 'Alternative',
'function_call': func,
'menu_icon': self.elements.alternative.illustrator.svg.clone(),
'type': 'alternative',
'params': [self.adaptor.description.elements.alternative, node]}];
- if((node.children('otherwise').length == 0) && node.parents('parallel').length == node.parents('parallel_branch').length)
+ if((node.children('otherwise').length == 0) && node.parents('parallel').length == node.parents('parallel_branch').length && node.parent('choose').length == 0)
childs.push({'label': 'Otherwise',
'function_call': self.adaptor.description.insert_last_into,
'menu_icon': self.elements.otherwise.illustrator.svg.clone(),
'type': 'otherwise',
'params': [self.adaptor.description.elements.otherwise, node]});
@@ -692,10 +692,10 @@
'params': [self.adaptor.description.elements.critical, node]}
];
}, //}}}
'adaptor': {//{{{
'mousedown': function (node,e) {
- self.events.mousedown(node,e,true,false);
+ self.events.mousedown(node,e,true,true);
},
'click': self.events.click,
'dblclick': self.events.dblclick,
'mouseover': self.events.mouseover,
'mouseout': self.events.mouseout,