Mercurial > hg > webaudioevaluationtool
diff interfaces/ape.js @ 2596:2d820b7413a7
#37: Completed interfaceContext.getLabel. APE uses this getLabel for creating the page labels.
author | Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk> |
---|---|
date | Thu, 10 Nov 2016 16:46:47 +0000 |
parents | 4fdaed765674 |
children | 8188efa9415d |
line wrap: on
line diff
--- a/interfaces/ape.js Thu Nov 10 16:31:01 2016 +0000 +++ b/interfaces/ape.js Thu Nov 10 16:46:47 2016 +0000 @@ -273,6 +273,11 @@ feedbackHolder.innerHTML = ""; sliderHolder.innerHTML = ""; + // Set labelType if default to number + if (audioHolderObject.label == "default" || audioHolderObject.label == "") { + audioHolderObject.label = "number"; + } + // Set the page title if (typeof audioHolderObject.title == "string" && audioHolderObject.title.length > 0) { document.getElementById("test-title").textContent = audioHolderObject.title @@ -592,22 +597,8 @@ // Create a new slider object; this.parent = audioObject; this.trackSliderObjects = []; - this.label = null; + this.label = interfaceContext.getLabel(audioObject.specification.parent.label, index, audioObject.specification.parent.labelStart); this.playing = false; - switch (audioObject.specification.parent.label) { - case "letter": - this.label = String.fromCharCode(97 + index); - break; - case "capital": - this.label = String.fromCharCode(65 + index); - break; - case "none": - this.label = ""; - break; - default: - this.label = "" + (index + 1); - break; - } for (var i = 0; i < interfaceContext.interfaceSliders.length; i++) { var trackObj = interfaceContext.interfaceSliders[i].createSliderObject(audioObject, this.label); this.trackSliderObjects.push(trackObj);