cockpit/js/instance.js in cpee-1.3.228 vs cockpit/js/instance.js in cpee-1.3.230
- old
+ new
@@ -72,11 +72,11 @@
$("input[name=votecontinue]").click(check_subscription);
$("input[name=testsetfile]").change(load_testsetfile_after);
$("input[name=modelfile]").change(load_modelfile_after);
$.ajax({
- url: "testsets/testsets.xml",
+ url: $('body').attr('current-testsets') + "testsets.xml",
dataType: 'xml',
success: function(res){
$('testset',res).each(function(){
var ts = $(this).text();
$('#predefinedtestsets').append($("<div class='menuitem'></div>").text(ts));
@@ -114,11 +114,11 @@
create_instance(q.exec,true);
}
}
});
$.ajax({
- url: "testsets/transformations.xml",
+ url: $('body').attr('current-testsets') + "transformations.xml",
dataType: 'xml',
success: function(res){
$('transformation',res).each(function(){
var ts = $(this).text();
$('#modeltypes').append($("<div class='menuitem'></div>").text(ts));
@@ -189,11 +189,11 @@
alert("An instance info is necessary!");
}
}
}// }}}
-function websocket() {
+function websocket() { //{{{
var url = $('body').attr('current-instance');
var Socket = "MozWebSocket" in window ? MozWebSocket : WebSocket;
if (ws) ws.close();
ws = new Socket(url.replace(/http/,'ws') + "/notifications/subscriptions/" + subscription + "/ws/");
ws.onopen = function() {
@@ -250,16 +250,18 @@
monitor_instance_values("endpoints");
monitor_instance_values("attributes");
monitor_instance_transformation();
monitor_instance_dsl();
monitor_instance_state();
-}
+} //}}}
function monitor_instance(load,exec) {// {{{
var url = sanitize_url($("input[name=instance-url]"));
+ sanitize_url($("input[name=base-url]"));
var rep = sanitize_url($("input[name=repo-url]"));
+
$('.tabbehind button').hide();
$('#dat_details').empty();
$.ajax({
type: "GET",
@@ -313,64 +315,66 @@
});
}// }}}
function monitor_instance_values(val) {// {{{
var url = $('body').attr('current-instance');
+ var rep = $('body').attr('current-repo');
$.ajax({
type: "GET",
url: url + "/properties/values/" + val + "/",
success: function(res){
save[val].content(res);
if (val == "endpoints") {
var tmp = {};
$(res).find(" > value > *").each(function(k,v) {
$.ajax({
- url: "https://centurio.work/plan/" + $(v).text(),
+ url: rep + encodeURIComponent($(v).text()),
success: function() {
tmp[v.tagName] = {};
- var deferreds = [];
- deferreds.push(
- $.ajax({
- url: "https://centurio.work/plan/" + $(v).text() + "/symbol.svg",
- success: function(res) {
- tmp[v.tagName]['symbol'] = res;
- }
- })
- );
- deferreds.push(
- $.ajax({
- url: "https://centurio.work/plan/" + $(v).text() + "/schema.rng",
- success: function(res) {
- tmp[v.tagName]['schema'] = res;
- }
- })
- );
+ var deferreds = [new $.Deferred(), new $.Deferred()];
+ $.ajax({
+ url: rep + encodeURIComponent($(v).text()) + "/symbol.svg",
+ success: function(res) {
+ tmp[v.tagName]['symbol'] = res;
+ deferreds[0].resolve(true);
+ },
+ error: deferreds[0].resolve
+ })
+ $.ajax({
+ url: rep + encodeURIComponent($(v).text()) + "/schema.rng",
+ success: function(res) {
+ tmp[v.tagName]['schema'] = res;
+ deferreds[1].resolve(true);
+ },
+ error: deferreds[1].resolve
+ })
$.when.apply($, deferreds).then(function(x) {
save['endpoints_cache'] = tmp;
// when updating attributes clear the attributes, because they might change as well. New arguments are possible.
$('#dat_details').empty();
adaptor_update();
});
}
});
});
+ } else if(val == "attributes") {
+ document.title = $(" > value > info",res).text() + " (" + url.replace(/\/$/,'').split(/[\\/]/).pop() + ")";
}
}
});
} // }}}
-function adaptor_update() {
+function adaptor_update() { //{{{
$('g.element[element-endpoint]').each(function(k,ele){
- if (save['endpoints_cache'][$(ele).attr('element-endpoint')]) {
+ if (save['endpoints_cache'][$(ele).attr('element-endpoint')] && save['endpoints_cache'][$(ele).attr('element-endpoint')]) {
var c = $(ele).find('g.replace');
var symbol = save['endpoints_cache'][$(ele).attr('element-endpoint')].symbol.documentElement;
c.replaceWith($(symbol).clone());
}
});
-}
-
-function adaptor_init(url,theme,dslx) {
+} //}}}
+function adaptor_init(url,theme,dslx) { //{{{
if (save['graph_theme'] != theme) {
save['graph_theme'] = theme;
save['graph_adaptor'] = new WfAdaptor($('body').data('theme-base') + '/' + theme + '/theme.js',function(graphrealization){
graphrealization.set_svg_container($('#graphcanvas'));
graphrealization.set_description($(dslx), true);
@@ -390,18 +394,18 @@
monitor_instance_pos();
$('#dat_details').empty();
});
} else {
save['graph_adaptor'].update(function(graphrealization){
- adaptor_update();
var svgid = manifestation.clicked();
graphrealization.set_description($(dslx));
+ adaptor_update();
manifestation.events.click(svgid);
monitor_instance_pos();
});
}
-}
+} //}}}
function monitor_graph_change(force) { //{{{
var url = $('body').attr('current-instance');
$.ajax({
type: "GET",
@@ -617,40 +621,30 @@
var pars = $X('<endpoints/>');
pars.append($(res.documentElement).children());
testset.append(pars);
$.ajax({
type: "GET",
- url: url + "/properties/values/positions/",
+ url: url + "/properties/values/dslx/",
success: function(res){
- var pars = $X('<positions/>');
- pars.append($(res.documentElement).children());
+ var pars = $X('<description/>');
+ pars.append($(res.documentElement));
testset.append(pars);
+ pars = $X("<transformation><description type='copy'/><dataelements type='none'/><endpoints type='none'/></transformation>");
+ testset.append(pars);
$.ajax({
type: "GET",
- url: url + "/properties/values/dslx/",
+ url: url + "/properties/values/attributes/",
success: function(res){
- var pars = $X('<description/>');
- pars.append($(res.documentElement));
+ var name = $("value > info",res).text();
+ var pars = $X('<attributes/>');
+ pars.append($(res.documentElement).children());
+ pars.find('uuid').remove();
testset.append(pars);
- pars = $X("<transformation><description type='copy'/><dataelements type='none'/><endpoints type='none'/></transformation>");
- testset.append(pars);
- $.ajax({
- type: "GET",
- url: url + "/properties/values/attributes/",
- success: function(res){
- var name = $("value > info",res).text();
- var pars = $X('<attributes/>');
- pars.append($(res.documentElement).children());
- pars.find('uuid').remove();
- testset.append(pars);
- var ct = new Date();
- $('#savetestset').attr('download',name + '_' + ct.strftime("%Y-%m-%dT%H%M%S%z") + '.xml');
- $('#savetestset').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(testset.serializePrettyXML()));
- document.getElementById('savetestset').click();
- },
- error: report_failure
- });
+ var ct = new Date();
+ $('#savetestset').attr('download',name + '_' + ct.strftime("%Y-%m-%dT%H%M%S%z") + '.xml');
+ $('#savetestset').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(testset.serializePrettyXML()));
+ document.getElementById('savetestset').click();
},
error: report_failure
});
},
error: report_failure
@@ -804,17 +798,17 @@
var name = $("#predefinedtestsets div.menuitem[data-selected=selected]").text();
$.ajax({
cache: false,
dataType: 'xml',
- url: "testsets/" + name + ".xml",
+ url: $('body').attr('current-testsets') + name + ".xml",
success: function(res){
save['dsl'] = null; // reload dsl and position under all circumstances
$('#main .tabbehind button').hide();
$('#dat_details').empty();
- document.title = name;
+ document.title = "Untitled";
set_testset(res,exec);
},
complete: function() {
loading = false;
}
@@ -827,10 +821,10 @@
var name = $("#modeltypes div.menuitem[data-selected=selected]").text();
$.ajax({
cache: false,
dataType: 'xml',
- url: "testsets/" + name + ".xml",
+ url: $('body').attr('current-testsets') + name + ".xml",
success: function(res){
$.ajax({
type: "PUT",
url: url + "/properties/values/attributes/modeltype",
data: ({value: name}),