comparison js/core.js @ 2689:f4a146282ef5

Several compatability fixes

         specification.decode(projectXML);
         // Use the original
         storage.initialise(responseDocument);
     }
     /// CHECK FOR SAMPLE RATE COMPATIBILITY
-    if (specification.sampleRate !== null) {
+    if (isFinite(specification.sampleRate)) {
         if (Number(specification.sampleRate) != audioContext.sampleRate) {
             var errStr = 'Sample rates do not match! Requested ' + Number(specification.sampleRate) + ', got ' + audioContext.sampleRate + '. Please set the sample rate to match before completing this test.';
             interfaceContext.lightbox.post("Error", errStr);
             return;
         }

             conditionFunction = processQuestionConditional;
         } else if (node.specification.type === "checkbox") {
             conditionFunction = processCheckboxConditional;
         } else if (node.specification.type === "radio") {
             conditionFunction = processRadioConditional;
-        } else if (node.specifiication.type === "number") {
+        } else if (node.specification.type === "number") {
             conditionFunction = processNumberConditional;
         } else if (node.specification.type === "slider") {
             conditionFunction = processSliderConditional;
         } else {
             return;

         }
         return false;
     }
 
     function postRadio(node) {
-        if (node.response === undefined) {
+        if (node.response === null) {
             node.response = {
                 name: "",
                 text: ""
             };
         }
-        var index = 0;
         var table = document.createElement("table");
         table.className = "popup-option-list";
         table.border = "0";
-        node.specification.options.forEach(function (option) {
+        if (node.response === null || node.response.length === 0) {
+            node.response = [];
+        }
+        node.specification.options.forEach(function (option, index) {
             var tr = document.createElement("tr");
             table.appendChild(tr);
             var td = document.createElement("td");
             tr.appendChild(td);
             var input = document.createElement('input');

             span.textContent = option.text;
             td.appendChild(span);
             tr = document.createElement('div');
             tr.setAttribute('name', 'option');
             tr.className = "popup-option-checbox";
-            if (node.response[index] !== undefined) {
-                if (node.response[index].checked === true) {
-                    input.checked = "true";
-                }
-            }
-            index++;
+            table.appendChild(tr);
         });
         this.popupResponse.appendChild(table);
     }
 
     function processRadio(node) {

     function exportElementTimer(parentElement) {
         var mElementTimer = storage.document.createElement('metricresult');
         mElementTimer.setAttribute('name', 'enableElementTimer');
         mElementTimer.textContent = this.listenedTimer;
         parentElement.appendChild(mElementTimer);
+        return mElementTimer;
     }
 
     function exportElementTrack(parentElement) {
         var elementTrackerFull = storage.document.createElement('metricresult');
         elementTrackerFull.setAttribute('name', 'elementTrackerFull');

             timePos.setAttribute("time", this.movementTracker[k][0]);
             timePos.setAttribute("value", this.movementTracker[k][1]);
             elementTrackerFull.appendChild(timePos);
         }
         parentElement.appendChild(elementTrackerFull);
+        return elementTrackerFull;
     }
 
     function exportElementListenTracker(parentElement) {
         var elementListenTracker = storage.document.createElement('metricresult');
         elementListenTracker.setAttribute('name', 'elementListenTracker');
         for (var k = 0; k < this.listenTracker.length; k++) {
             elementListenTracker.appendChild(this.listenTracker[k]);
         }
         parentElement.appendChild(elementListenTracker);
+        return elementListenTracker;
     }
 
     function exportElementInitialPosition(parentElement) {
         var elementInitial = storage.document.createElement('metricresult');
         elementInitial.setAttribute('name', 'elementInitialPosition');
         elementInitial.textContent = this.initialPosition;
         parentElement.appendChild(elementInitial);
+        return elementInitial;
     }
 
     function exportFlagListenedTo(parentElement) {
         var flagListenedTo = storage.document.createElement('metricresult');
         flagListenedTo.setAttribute('name', 'elementFlagListenedTo');
         flagListenedTo.textContent = this.wasListenedTo;
         parentElement.appendChild(flagListenedTo);
+        return flagListenedTo;
     }
 
     function exportFlagMoved(parentElement) {
         var flagMoved = storage.document.createElement('metricresult');
         flagMoved.setAttribute('name', 'elementFlagMoved');
         flagMoved.textContent = this.wasMoved;
         parentElement.appendChild(flagMoved);
+        return flagMoved;
     }
 
     function exportFlagComments(parentElement) {
         var flagComments = storage.document.createElement('metricresult');
         flagComments.setAttribute('name', 'elementFlagComments');

             flagComments.textContent = 'false';
         } else {
             flagComments.textContet = 'true';
         }
         parentElement.appendChild(flagComments);
+        return flagComments;
     }
 
     this.exportXMLDOM = function (parentElement) {
+        var elems = []
         if (audioEngineContext.metric.enableElementTimer) {
-            exportElementTimer.call(this, parentElement);
+            elems.push(exportElementTimer.call(this, parentElement));
         }
         if (audioEngineContext.metric.enableElementTracker) {
-            exportElementTrack.call(this, parentElement);
+            elems.push(exportElementTrack.call(this, parentElement));
         }
         if (audioEngineContext.metric.enableElementListenTracker) {
-            exportElementListenTracker.call(this, parentElement);
+            elems.push(exportElementListenTracker.call(this, parentElement));
         }
         if (audioEngineContext.metric.enableElementInitialPosition) {
-            exportElementInitialPosition.call(this, parentElement);
+            elems.push(exportElementInitialPosition.call(this, parentElement));
         }
         if (audioEngineContext.metric.enableFlagListenedTo) {
-            exportFlagListenedTo.call(this, parentElement);
+            elems.push(exportFlagListenedTo.call(this, parentElement));
         }
         if (audioEngineContext.metric.enableFlagMoved) {
-            exportFlagMoved.call(this, parentElement);
+            elems.push(exportFlagMoved.call(this, parentElement));
         }
         if (audioEngineContext.metric.enableFlagComments) {
-            exportFlagComments.call(this, parentElement);
-        }
+            elems.push(exportFlagComments.call(this, parentElement));
+        }
+        return elems;
     };
 }
 
 function Interface(specificationObject) {
     // This handles the bindings between the interface and the audioEngineContext;

             text = text.firstChild;
             options.style.marginRight = spanMargin;
             options.style.marginLeft = spanMargin;
             text.style.marginRight = spanMargin;
             text.style.marginLeft = spanMargin;
-            while (options.nextSibling !== undefined) {
-                options = options.nextSibling;
+            while (options = options.nextSibling) {
                 text = text.nextSibling;
                 options.style.marginRight = spanMargin;
                 options.style.marginLeft = spanMargin;
                 text.style.marginRight = spanMargin;
                 text.style.marginLeft = spanMargin;

             text = text.firstChild;
             options.style.marginRight = spanMargin;
             options.style.marginLeft = spanMargin;
             text.style.marginRight = spanMargin;
             text.style.marginLeft = spanMargin;
-            while (options.nextSibling !== undefined) {
-                options = options.nextSibling;
+            while (options = options.nextSibling) {
                 text = text.nextSibling;
                 options.style.marginRight = spanMargin;
                 options.style.marginLeft = spanMargin;
                 text.style.marginRight = spanMargin;
                 text.style.marginLeft = spanMargin;