Mercurial > hg > webaudioevaluationtool
comparison js/core.js @ 2561:f5d8a0af942f
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author | www-data <www-data@sucuk.dcs.qmul.ac.uk> |
---|---|
date | Thu, 19 Jan 2017 17:20:44 +0000 |
parents | c40cda1c2839 |
children | d75db08e5801 |
comparison
equal
deleted
inserted
replaced
2558:137f5e0afcb8 | 2561:f5d8a0af942f |
---|---|
1190 // For each selected page, we must get the sub pool | 1190 // For each selected page, we must get the sub pool |
1191 if (pageInclude[i].poolSize != 0 && pageInclude[i].poolSize != pageInclude[i].audioElements.length) { | 1191 if (pageInclude[i].poolSize != 0 && pageInclude[i].poolSize != pageInclude[i].audioElements.length) { |
1192 var elemInclude = []; | 1192 var elemInclude = []; |
1193 var elemPool = []; | 1193 var elemPool = []; |
1194 for (var elem of pageInclude[i].audioElements) { | 1194 for (var elem of pageInclude[i].audioElements) { |
1195 if (elem.include || elem.type != "normal") { | 1195 if (elem.alwaysInclude || elem.type != "normal") { |
1196 elemInclude.push(elem); | 1196 elemInclude.push(elem); |
1197 } else { | 1197 } else { |
1198 elemPool.push(elem); | 1198 elemPool.push(elem); |
1199 } | 1199 } |
1200 } | 1200 } |