cockpit/js/instance.js in cpee-1.4.17 vs cockpit/js/instance.js in cpee-1.4.18

- old
+ new

@@ -15,10 +15,11 @@ save['endpoints_cache'] = {}; save['dataelements'] = undefined; save['attributes'] = undefined; save['details'] = undefined; save['details_target'] = undefined; + save['instance_pos'] = []; var node_state = {}; var sub_more = 'topic' + '=' + 'activity' + '&' +// {{{ 'events' + '=' + 'calling,status,manipulating,failed,done' + '&' + 'topic' + '=' + 'activity' + '&' + 'votes' + '=' + 'syncing_after' + '&' + @@ -390,10 +391,11 @@ url: url + "/properties/values/description/", data: ({'content': '<content>' + g + '</content>'}) }); adaptor_update(); manifestation.events.click(svgid); + format_instance_pos(); }; adaptor_update(); monitor_instance_pos(); $('#dat_details').empty(); }); @@ -401,11 +403,11 @@ save['graph_adaptor'].update(function(graphrealization){ var svgid = manifestation.clicked(); graphrealization.set_description($(dslx)); adaptor_update(); manifestation.events.click(svgid); - monitor_instance_pos(); + format_instance_pos(); }); } } //}}} function monitor_graph_change(force) { //{{{ @@ -482,16 +484,13 @@ var url = $('body').attr('current-instance'); $.ajax({ type: "GET", url: url + "/properties/values/positions/", success: function(res){ - var values = $("value > *",res); + save['instance_pos'] = $("value > *",res); format_visual_clear(); - values.each(function(){ - var what = this.nodeName; - format_visual_add(what,save['state'] == 'running' ? 'active' : 'passive'); - }); + format_instance_pos(); } }); }// }}} function monitor_instance_running(notification,event) {// {{{ @@ -552,10 +551,13 @@ if (parts['at']) { $.each(parts['at'],function(a,b){ format_visual_add(b.position,"passive") }); } + if (!parts['at'] && !parts['unmark'] && !parts['after'] && !parts['wait']) { + monitor_instance_pos(); + } } // }}} function monitor_instance_vote_add(notification) {// {{{ var parts = JSON.parse(notification); var ctv = $("#votes"); @@ -1076,10 +1078,17 @@ }//}}} function format_visual_vote_clear() {//{{{ node_state = {}; $('.super .vote').each(function(a,b){b.setAttribute("class","vote");}); $("#votes").empty(); -}//}}} + }//}}} + +function format_instance_pos() { //{{{ + $(save['instance_pos']).each(function(){ + var what = this.nodeName; + format_visual_add(what,save['state'] == 'running' ? 'active' : 'passive'); + }); +} //}}} function format_visual_forms() { //{{{ if (save['state'] != "ready" && save['state'] != "stopped") { $(paths).each(function(k,e){ if ($(e).attr('contenteditable')) { $(e).attr('contenteditable','false'); }