Mercurial > hg > webaudioevaluationtool
changeset 2834:9675c2cf79b2
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
| author | www-data <www-data@sucuk.dcs.qmul.ac.uk> |
|---|---|
| date | Mon, 26 Jun 2017 12:21:06 +0100 |
| parents | 68727eab8bb6 (current diff) 47f187d4fc71 (diff) |
| children | e61531ce764f |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/js/core.js Tue May 16 22:20:35 2017 +0100 +++ b/js/core.js Mon Jun 26 12:21:06 2017 +0100 @@ -1198,9 +1198,9 @@ // First extract those excluded from picking process var picked = []; - pool.forEach(function (e) { + pool.forEach(function (e, i) { if (e.alwaysInclude) { - picked.push(e); + picked.push(pool.splice(i, 1)[0]); } });
--- a/python/score_parser.py Tue May 16 22:20:35 2017 +0100 +++ b/python/score_parser.py Mon Jun 26 12:21:06 2017 +0100 @@ -85,7 +85,7 @@ audioElement = page.find("./audioelement/[@ref='"+ fragmentname+ "']") # Get the element for value in audioElement.findall('./value'): axisName = value.get('interface-name') - if axisName == None: + if axisName == None or axisName == "null": axisName = 'default' axisStore = storage[page_name]['axis'][axisName] if hasattr(value, 'text'):