comparison interfaces/discrete.js @ 2651:22efb2d04bc9

#6: Added for rest

     // Called each time a new test page is to be build. The page specification node is the only item passed in
     var id = page.id;
 
     var feedbackHolder = document.getElementById('feedbackHolder');
     feedbackHolder.innerHTML = "";
-    var interfaceObj = page.interfaces;
+    var interfaceObj = interfaceContext.getCombinedInterfaces(page);
     if (interfaceObj.length > 1) {
         console.log("WARNING - This interface only supports one <interface> node per page. Using first interface node");
     }
     interfaceObj = interfaceObj[0];
 

     if (interfaceObj.commentBoxPrefix != undefined) {
         commentBoxPrefix = interfaceObj.commentBoxPrefix;
     }
     var loopPlayback = page.loop;
 
+    for (var option of interfaceObj.options) {
+        if (option.type == "show") {
+            switch (option.name) {
+                case "playhead":
+                    var playbackHolder = document.getElementById('playback-holder');
+                    if (playbackHolder == null) {
+                        playbackHolder = document.createElement('div');
+                        playbackHolder.style.width = "100%";
+                        playbackHolder.align = 'center';
+                        playbackHolder.appendChild(interfaceContext.playhead.object);
+                        feedbackHolder.appendChild(playbackHolder);
+                    }
+                    break;
+                case "page-count":
+                    var pagecountHolder = document.getElementById('page-count');
+                    if (pagecountHolder == null) {
+                        pagecountHolder = document.createElement('div');
+                        pagecountHolder.id = 'page-count';
+                    }
+                    pagecountHolder.innerHTML = '<span>Page ' + (testState.stateIndex + 1) + ' of ' + testState.stateMap.length + '</span>';
+                    var inject = document.getElementById('interface-buttons');
+                    inject.appendChild(pagecountHolder);
+                    break;
+                case "volume":
+                    if (document.getElementById('master-volume-holder') == null) {
+                        feedbackHolder.appendChild(interfaceContext.volume.object);
+                    }
+                    break;
+                case "comments":
+                    interfaceContext.commentBoxes.showCommentBoxes(feedbackHolder, true);
+                    break;
+            }
+        }
+    }
+
     // Find all the audioElements from the audioHolder
     var index = 0;
-    var interfaceScales = testState.currentStateMap.interfaces[0].scales;
+    var interfaceScales = page.interfaces[0].scales;
     var labelType = page.label;
     if (labelType == "default") {
         labelType = "number";
     }
     $(page.audioElements).each(function (pageIndex, element) {

             interfaceContext.commentBoxes.createCommentBox(audioObject);
             index += 1;
         }
 
     });
-
-    var interfaceOptions = specification.interfaces.options.concat(interfaceObj.options);
-    for (var option of interfaceOptions) {
-        if (option.type == "show") {
-            switch (option.name) {
-                case "playhead":
-                    var playbackHolder = document.getElementById('playback-holder');
-                    if (playbackHolder == null) {
-                        playbackHolder = document.createElement('div');
-                        playbackHolder.style.width = "100%";
-                        playbackHolder.align = 'center';
-                        playbackHolder.appendChild(interfaceContext.playhead.object);
-                        feedbackHolder.appendChild(playbackHolder);
-                    }
-                    break;
-                case "page-count":
-                    var pagecountHolder = document.getElementById('page-count');
-                    if (pagecountHolder == null) {
-                        pagecountHolder = document.createElement('div');
-                        pagecountHolder.id = 'page-count';
-                    }
-                    pagecountHolder.innerHTML = '<span>Page ' + (testState.stateIndex + 1) + ' of ' + testState.stateMap.length + '</span>';
-                    var inject = document.getElementById('interface-buttons');
-                    inject.appendChild(pagecountHolder);
-                    break;
-                case "volume":
-                    if (document.getElementById('master-volume-holder') == null) {
-                        feedbackHolder.appendChild(interfaceContext.volume.object);
-                    }
-                    break;
-                case "comments":
-                    interfaceContext.commentBoxes.showCommentBoxes(feedbackHolder, true);
-                    break;
-            }
-        }
-    }
 
     $(page.commentQuestions).each(function (index, element) {
         var node = interfaceContext.createCommentQuestion(element);
         feedbackHolder.appendChild(node.holder);
     });

     }
 }
 
 function buttonSubmitClick() // TODO: Only when all songs have been played!
 {
-    var checks = [];
-    checks = checks.concat(testState.currentStateMap.interfaces[0].options);
-    checks = checks.concat(specification.interfaces.options);
-    var canContinue = true;
+    var checks = testState.currentStateMap.interfaces[0].options,
+        canContinue = true;
 
     // Check that the anchor and reference objects are correctly placed
     if (interfaceContext.checkHiddenAnchor() == false) {
         return;
     }