Mercurial > hg > webaudioevaluationtool

changeset 2596:2d820b7413a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#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 bc5c449c97e1
files interfaces/ape.js js/core.js
diffstat 2 files changed, 13 insertions(+), 22 deletions(-) [+]
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);
--- a/js/core.js	Thu Nov 10 16:31:01 2016 +0000
+++ b/js/core.js	Thu Nov 10 16:46:47 2016 +0000
@@ -3250,9 +3250,9 @@
             }
             switch (labelType) {
                 case "letter":
-                    return String.fromCharCode((index + offset) % 26 + 96);
+                    return String.fromCharCode((index + offset) % 26 + 97);
                 case "capital":
-                    return String.fromCharCode((index + offset) % 26 + 65);
+                    return String.fromCharCode((index + offset) % 26 + 66);
                 case "number":
                     return String(index + offset);
                 default:
@@ -3260,33 +3260,33 @@
             }
         }
 
-        if (typeof labelStart !== "string") {
+        if (typeof labelStart !== "string" || labelStart.length == 0) {
             labelStart = String.fromCharCode(0);
         }
 
         switch (labelType) {
             case "letter":
                 labelStart = labelStart.charCodeAt(0);
-                if (labelStart.charCodeAt(0) < 97 || label.charCodeAt(0) > 122) {
+                if (labelStart < 97 || labelStart > 122) {
                     labelStart = 97;
                 }
                 labelStart -= 97;
                 break;
             case "capital":
                 labelStart = labelStart.charCodeAt(0);
-                if (labelStart.charCodeAt(0) < 65 || label.charCodeAt(0) > 90) {
+                if (labelStart < 65 || labelStart > 90) {
                     labelStart = 65;
                 }
                 labelStart -= 65;
                 break;
             case "number":
-                if (!isFinite(Number(label))) {
+                if (!isFinite(Number(labelStart))) {
                     labelStart = 1;
                 }
                 break;
             case "none":
             default:
-                labelStart = "";
+                labelStart = 0;
         }
         if (typeof index == "number") {
             return calculateLabel(labelType, index, labelStart);