comparison js/core.js @ 2733:f2bb15d5f5c9

#144 #190. Better handling of 'completed' tags in <page> and <waetresult> nodes.

     // Clear the window.onbeforeunload
     window.onbeforeunload = null;
     // Save the data from interface into XML and send to destURL
     // If destURL is null then download XML in client
     // Now time to render file locally
-    var xmlDoc = interfaceXMLSave();
+    var xmlDoc = storage.finish();
     var parent = document.createElement("div");
     parent.appendChild(xmlDoc);
     var file = [parent.innerHTML];
     if (destURL == "local") {
         var bb = new Blob(file, {

     this.globalPostTest = null;
     this.testPages = [];
     this.document = null;
     this.root = null;
     this.state = 0;
-    var pFilenamePrefix = "";
+    var pFilenamePrefix = "save";
 
     this.initialise = function (existingStore) {
         if (existingStore === undefined) {
             // We need to get the sessionKey
             this.SessionKey.requestKey();

             // Final upload to complete the test
             this.parent.finish();
             var hold = document.createElement("div");
             var clone = this.parent.root.cloneNode(true);
             hold.appendChild(clone);
+            var saveURL = specification.returnURL + "php/save.php?key=" + this.key + "&saveFilenamePrefix=";
+            if (this.parent.filenamePrefix.length == 0) {
+                saveURL += "save";
+            } else {
+                saveURL += this.parent.filenamePrefix;
+            }
             return new Promise(function (resolve, reject) {
-                var saveURL = specification.returnURL + "php/save.php?key=" + this.key + "&saveFilenamePrefix=" + this.parent.filenamePrefix;
                 var xmlhttp = new XMLHttpRequest();
                 xmlhttp.open("POST", saveURL);
                 xmlhttp.setRequestHeader('Content-Type', 'text/xml');
                 xmlhttp.onerror = function () {
                     console.log('Error updating file to server!');