comparison js/core.js @ 2350:1ab42e36b6c8

Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

 		{
             popup.hidePopup();
 			if (this.currentStateMap == null)
 			{
 				this.currentStateMap = this.stateMap[this.stateIndex];
+                // Find and extract the outside reference
+                var elements = [], ref = null;
+                for (var elem of this.currentStateMap.audioElements) {
+                    if (elem.type == "outside-reference") {ref = elem;}
+                    else {elements.push(elem);}
+                }
 				if (this.currentStateMap.randomiseOrder)
 				{
-					this.currentStateMap.audioElements = randomiseOrder(this.currentStateMap.audioElements);
+					this.currentStateMap.audioElements = randomiseOrder(elements);
 				}
+                if (ref != null)
+                {
+                    this.currentStateMap.audioElements.push(ref);
+                }
                 this.currentStore = storage.testPages[this.stateIndex];
 				if (this.currentStateMap.preTest != null)
 				{
 					this.currentStatePosition = 'pre';
 					popup.initState(this.currentStateMap.preTest,storage.testPages[this.stateIndex].preTest);