comparison js/specification.js @ 2854:aed359997687

More functional changes to specification.js

     this.preSilence = undefined;
     this.postSilence = undefined;
     this.playOne = undefined;
 
     // nodes
-    this.metrics = undefined;
+    this.metrics = new metricNode();
     this.preTest = undefined;
     this.postTest = undefined;
     this.pages = [];
-    this.interfaces = undefined;
+    this.interfaces = new interfaceNode(this);
     this.errors = [];
     this.exitText = "Thank you.";
 
     var processAttribute = function (attribute, schema) {
         // attribute is the string returned from getAttribute on the XML

         var exitTextNode = setupNode.getElementsByTagName('exitText');
         if (exitTextNode.length == 1) {
             this.exitText = exitTextNode[0].textContent;
         }
 
-        this.metrics = new this.metricNode();
-
         this.metrics.decode(this, setupNode.getElementsByTagName('metric')[0]);
 
         // Now process the survey node options
         var survey = setupNode.getElementsByTagName('survey');
         for (i = 0; i < survey.length; i++) {
             var location = survey[i].getAttribute('location');
             switch (location) {
                 case 'pre':
                 case 'before':
-                    this.preTest = new this.surveyNode(this);
+                    this.preTest = new surveyNode(this);
                     this.preTest.decode(this, survey[i]);
                     break;
                 case 'post':
                 case 'after':
-                    this.postTest = new this.surveyNode(this);
+                    this.postTest = new surveyNode(this);
                     this.postTest.decode(this, survey[i]);
                     break;
             }
         }
 
         var interfaceNode = setupNode.getElementsByTagName('interface');
         if (interfaceNode.length > 1) {
             this.errors.push("Only one <interface> node in the <setup> node allowed! Others except first ingnored!");
         }
-        this.interfaces = new this.interfaceNode(this);
+
         if (interfaceNode.length !== 0) {
             interfaceNode = interfaceNode[0];
             this.interfaces.decode(this, interfaceNode, this.schema.querySelectorAll('[name=interface]')[1]);
         }
 
         // Page tags
         var pageTags = projectXML.getElementsByTagName('page');
         var pageSchema = this.schema.querySelector('[name=page]');
         for (i = 0; i < pageTags.length; i++) {
-            var node = new this.page(this);
+            var node = new page(this);
             node.decode(this, pageTags[i], pageSchema);
             this.pages.push(node);
         }
     };
 

             root.appendChild(page.encode(RootDocument));
         });
         return RootDocument;
     };
 
-    this.surveyNode = function (specification) {
+    function surveyNode(specification) {
         this.location = undefined;
         this.options = [];
         this.parent = undefined;
         this.schema = schemaRoot.querySelector('[name=survey]');
         this.specification = specification;

             }
             return node;
         };
     };
 
-    this.interfaceNode = function (specification) {
+    function interfaceNode(specification) {
         this.title = undefined;
         this.name = undefined;
         this.image = undefined;
         this.options = [];
         this.scales = [];
-        this.schema = schemaRoot.querySelectorAll('[name=interface]')[1];
+        this.schema = undefined;
 
         this.decode = function (parent, xml) {
+            this.schema = schemaRoot.querySelectorAll('[name=interface]')[1];
             this.name = xml.getAttribute('name');
             var titleNode = xml.getElementsByTagName('title');
             if (titleNode.length == 1) {
                 this.title = titleNode[0].textContent;
             }

             }
             return node;
         };
     };
 
-    this.metricNode = function () {
+    function metricNode() {
         this.enabled = [];
         this.decode = function (parent, xml) {
             var children = xml.getElementsByTagName('metricenable');
             for (var i in children) {
                 if (isNaN(Number(i)) === true) {

             }
             return node;
         };
     };
 
-    this.page = function (specification) {
+    function page(specification) {
         this.presentedId = undefined;
         this.id = undefined;
         this.title = undefined;
         this.hostURL = undefined;
         this.randomiseOrder = undefined;

             if (CBP.length !== 0 && CBP[0].parentElement == xml) {
                 this.commentBoxPrefix = CBP[0].textContent;
             }
 
             // Now decode the interfaces
-            var interfaceNode = xml.getElementsByTagName('interface');
-            for (i = 0; i < interfaceNode.length; i++) {
-                node = new parent.interfaceNode(this.specification);
-                node.decode(this, interfaceNode[i], parent.schema.querySelectorAll('[name=interface]')[1]);
+            var interfaceNodes = xml.getElementsByTagName('interface');
+            for (i = 0; i < interfaceNodes.length; i++) {
+                node = new interfaceNode(this.specification);
+                node.decode(this, interfaceNodes[i], parent.schema.querySelectorAll('[name=interface]')[1]);
                 this.interfaces.push(node);
             }
 
             // Now process the survey node options
             var survey = xml.getElementsByTagName('survey');

                 var location = survey[i].getAttribute('location');
                 if (location == 'pre' || location == 'before') {
                     if (this.preTest !== undefined) {
                         this.errors.push("Already a pre/before test survey defined! Ignoring second!!");
                     } else {
-                        this.preTest = new parent.surveyNode(this.specification);
+                        this.preTest = new surveyNode(this.specification);
                         this.preTest.decode(parent, survey[i], surveySchema);
                     }
                 } else if (location == 'post' || location == 'after') {
                     if (this.postTest !== undefined) {
                         this.errors.push("Already a post/after test survey defined! Ignoring second!!");
                     } else {
-                        this.postTest = new parent.surveyNode(this.specification);
+                        this.postTest = new surveyNode(this.specification);
                         this.postTest.decode(parent, survey[i], surveySchema);
                     }
                 }
             }
 
             // Now process the audioelement tags
             var audioElements = xml.getElementsByTagName('audioelement');
             for (i = 0; i < audioElements.length; i++) {
-                var audioNode = new this.audioElementNode(this.specification);
+                var audioNode = new audioElementNode(this.specification);
                 audioNode.decode(this, audioElements[i]);
                 this.audioElements.push(audioNode);
             }
 
             // Now decode the commentquestions
             var cqNode = xml.getElementsByTagName('commentquestions');
             if (cqNode.length !== 0) {
                 cqNode = cqNode[0];
                 var commentQuestion = cqNode.firstElementChild;
                 while (commentQuestion) {
-                    node = new this.commentQuestionNode(this.specification);
+                    node = new commentQuestionNode(this.specification);
                     node.decode(parent, commentQuestion);
                     this.commentQuestions.push(node);
                     commentQuestion = commentQuestion.nextElementSibling;
                 }
             }

             AHNode.appendChild(this.preTest.encode(root));
             AHNode.appendChild(this.postTest.encode(root));
             return AHNode;
         };
 
-        this.commentQuestionNode = function (specification) {
+        function commentQuestionNode(specification) {
             this.id = undefined;
             this.name = undefined;
             this.type = undefined;
             this.statement = undefined;
             this.schema = schemaRoot.querySelector('[name=commentquestion]');

                 }
                 return node;
             };
         };
 
-        this.audioElementNode = function (specification) {
+        function audioElementNode(specification) {
             this.url = undefined;
             this.id = undefined;
             this.name = undefined;
             this.parent = undefined;
             this.type = undefined;