cockpit/js/instance.js in cpee-1.3.121 vs cockpit/js/instance.js in cpee-1.3.122

@@ -46,10 +46,11 @@
   $("input[name=base-url]").val(location.protocol + "//" + location.host + ":9298/");
   $("button[name=base]").click(create_instance);
   $("button[name=instance]").click(monitor_instance);
   $("button[name=loadtestset]").click(load_testset);
   $("button[name=loadtestsetfile]").click(load_testsetfile);
+  $("button[name=loadmodelfile]").click(load_modelfile);
   $("button[name=savetestset]").click(function(){ save_testset(); });
   $("button[name=savesvg]").click(function(){ save_svg(); });
   $("input[name=votecontinue]").click(check_subscription);
 
   $.ajax({ 
@@ -554,11 +555,11 @@
         error: report_failure
       });
     }  
   });
 }// }}}
-function set_testset (testset) {// {{{
+function set_testset(testset) {// {{{
   var url = $("input[name=current-instance]").val();
 
   $.ajax({
     type: "GET", 
     url: url + "/notifications/subscriptions/",
@@ -605,11 +606,11 @@
         data: ({value: res}),
         error: report_failure
       });
     }
   });
-}// }}}
+ }// }}}
 function load_testsetfile() { //{{{
   if (running) return;
   if (typeof window.FileReader !== 'function') {
     alert('FileReader not yet supportet');
     return;
@@ -622,10 +623,27 @@
   }  
   reader.onerror = function(){ running  = false; }  
   reader.onabort = function(){ running  = false; }  
   reader.readAsText(files[0]);
 } //}}}
+function load_modelfile() { //{{{
+  if (running) return;
+  if (typeof window.FileReader !== 'function') {
+    alert('FileReader not yet supportet');
+    return;
+  }  
+  var files = $('#modelfile').get(0).files;
+  var reader = new FileReader();
+  reader.onload = function(){
+    var url = $("input[name=current-instance]").val();
+    load_des(url,reader.result);
+    running  = false;
+  }  
+  reader.onerror = function(){ running  = false; }  
+  reader.onabort = function(){ running  = false; }  
+  reader.readAsText(files[0]);
+} //}}}
 function load_testset() {// {{{
   if (running) return;
   running  = true;
   save['dsl'] = null; // reload dsl and position under all circumstances
   
@@ -644,21 +662,26 @@
     }
   });
   running  = false;
 }// }}}
 
-function load_testset_des(url,testset) {// {{{
-  var ser = '';
-  $("testset > description > *",testset).each(function(){
-    ser += $(this).serializeXML() + "\n";
-  });
-  var val = "<content>" + ser + "</content>";
+function load_des(url,model) { //{{{
+  model = model.replace(/<\?[^\?]+\?>/,'');
+  var val = "<content>" + model + "</content>";
   $.ajax({
     type: "PUT", 
     url: url + "/properties/values/description",
     data: ({content: val}),
     error: report_failure
   });
+}   //}}}
+
+function load_testset_des(url,testset) {// {{{
+  var ser = '';
+  $("testset > description > *",testset).each(function(){
+    ser += $(this).serializeXML() + "\n";
+  });
+  load_des(url,ser);
 } // }}}
 function load_testset_hw(url,testset) {// {{{
   $("testset > handlerwrapper",testset).each(function(){
     var val = $(this).text();
     $.ajax({