cockpit/js/instance.js in cpee-2.1.44 vs cockpit/js/instance.js in cpee-2.1.45

- old
+ new

@@ -720,11 +720,10 @@ } if (content['unmark']) { $.each(content['unmark'],function(a,b){ if (save['activity_blue_states'][b.uuid]) { format_visual_remove(b.position,"passive") - console.log('rrrrr'); } save['activity_blue_states'][b.uuid] = true setTimeout(() => {delete save['activity_blue_states'][b.uuid]},5000); }); } @@ -1430,16 +1429,16 @@ function ui_pos(e,bl) { var url = $('body').attr('current-instance'); var coll = []; $('g.element.primitive > g.activities.active, g.element.primitive > g.activities.passive').each(function(a,b){ - coll.push($(b).parent().attr('element-id')); + coll.push([$(b).parent().attr('element-id'), $(b).parent().attr('element-type') == 'stop' ? 'after' : 'at']); }); coll = bl(coll); var vals = ""; $(coll).each(function(k,ele){ - vals += "<" + ele + ">at</" + ele + ">"; + vals += "<" + ele[0] + ">" + ele[1] + "</" + ele[0] + ">"; }); vals = "<positions xmlns='http://cpee.org/ns/properties/2.0'>" + vals + "</positions>"; $.ajax({ type: "PUT", url: url + "/properties/positions/", @@ -1459,9 +1458,9 @@ return coll; }); } function add_ui_pos(e) { ui_pos(e,function(coll){ - coll.push($(e).attr('id')); + coll.push([$(e).attr('id'), e.nodeName == 'stop' ? 'after' : 'at']); return coll; }); }