comparison js/core.js @ 2652:d75db08e5801

Merge branch 'master' into vnext
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Thu, 19 Jan 2017 17:00:24 +0000
parents 8f3ea7ce794b c40cda1c2839
children b8df0a0e29f5 68bc1003770a
comparison
equal deleted inserted replaced
2651:22efb2d04bc9 2652:d75db08e5801
1229 // For each selected page, we must get the sub pool 1229 // For each selected page, we must get the sub pool
1230 if (pageInclude[i].poolSize != 0 && pageInclude[i].poolSize != pageInclude[i].audioElements.length) { 1230 if (pageInclude[i].poolSize != 0 && pageInclude[i].poolSize != pageInclude[i].audioElements.length) {
1231 var elemInclude = []; 1231 var elemInclude = [];
1232 var elemPool = []; 1232 var elemPool = [];
1233 for (var elem of pageInclude[i].audioElements) { 1233 for (var elem of pageInclude[i].audioElements) {
1234 if (elem.include || elem.type != "normal") { 1234 if (elem.alwaysInclude || elem.type != "normal") {
1235 elemInclude.push(elem); 1235 elemInclude.push(elem);
1236 } else { 1236 } else {
1237 elemPool.push(elem); 1237 elemPool.push(elem);
1238 } 1238 }
1239 } 1239 }