Mercurial > hg > webaudioevaluationtool
comparison js/core.js @ 2625:e3cf3c24149e
Including samediff into global label-maker (34b20b6)
Merge branch 'master' into vnext
# Conflicts:
# interfaces/AB.js
author | Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk> |
---|---|
date | Thu, 19 Jan 2017 10:47:42 +0000 |
parents | a33b66ca3baa |
children | 77204f78386a |
comparison
equal
deleted
inserted
replaced
2624:a33b66ca3baa | 2625:e3cf3c24149e |
---|---|
3268 switch (labelType) { | 3268 switch (labelType) { |
3269 case "letter": | 3269 case "letter": |
3270 return String.fromCharCode((index + offset) % 26 + 97); | 3270 return String.fromCharCode((index + offset) % 26 + 97); |
3271 case "capital": | 3271 case "capital": |
3272 return String.fromCharCode((index + offset) % 26 + 65); | 3272 return String.fromCharCode((index + offset) % 26 + 65); |
3273 case "samediff": | |
3274 if (index == 0) { | |
3275 return "Same"; | |
3276 } else if (index == 1) { | |
3277 return "Difference"; | |
3278 } else { | |
3279 return ""; | |
3280 } | |
3273 case "number": | 3281 case "number": |
3274 return String(index + offset); | 3282 return String(index + offset); |
3275 default: | 3283 default: |
3276 return ""; | 3284 return ""; |
3277 } | 3285 } |