Mercurial > hg > webaudioevaluationtool
changeset 1858:bd3ddaff2847
Bug #1629: Updated on page progress counter to reflect if using a subset.
author | Nicholas Jillings <nickjillings@users.noreply.github.com> |
---|---|
date | Tue, 23 Feb 2016 16:10:22 +0000 |
parents | dc09a8a78c79 |
children | 87a25feccc73 |
files | interfaces/AB.js interfaces/ape.js interfaces/discrete.js interfaces/horizontal-sliders.js interfaces/mushra.js |
diffstat | 5 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/interfaces/AB.js Tue Feb 23 16:06:03 2016 +0000 +++ b/interfaces/AB.js Tue Feb 23 16:10:22 2016 +0000 @@ -134,7 +134,7 @@ pagecountHolder = document.createElement('div'); pagecountHolder.id = 'page-count'; } - pagecountHolder.innerHTML = '<span>Page '+(audioHolderObject.presentedId+1)+' of '+specification.pages.length+'</span>'; + pagecountHolder.innerHTML = '<span>Page '+(testState.stateIndex+1)+' of '+testState.stateMap.length+'</span>'; var inject = document.getElementById('interface-buttons'); inject.appendChild(pagecountHolder); break;
--- a/interfaces/ape.js Tue Feb 23 16:06:03 2016 +0000 +++ b/interfaces/ape.js Tue Feb 23 16:10:22 2016 +0000 @@ -319,7 +319,7 @@ pagecountHolder = document.createElement('div'); pagecountHolder.id = 'page-count'; } - pagecountHolder.innerHTML = '<span>Page '+(audioHolderObject.presentedId+1)+' of '+specification.pages.length+'</span>'; + pagecountHolder.innerHTML = '<span>Page '+(testState.stateIndex+1)+' of '+testState.stateMap.length+'</span>'; var inject = document.getElementById('interface-buttons'); inject.appendChild(pagecountHolder); } else if (interfaceList[k].options[i].type == 'show' && interfaceList[k].options[i].name == 'volume') {
--- a/interfaces/discrete.js Tue Feb 23 16:06:03 2016 +0000 +++ b/interfaces/discrete.js Tue Feb 23 16:10:22 2016 +0000 @@ -149,7 +149,7 @@ pagecountHolder = document.createElement('div'); pagecountHolder.id = 'page-count'; } - pagecountHolder.innerHTML = '<span>Page '+(page.presentedId+1)+' of '+specification.pages.length+'</span>'; + pagecountHolder.innerHTML = '<span>Page '+(testState.stateIndex+1)+' of '+testState.stateMap.length+'</span>'; var inject = document.getElementById('interface-buttons'); inject.appendChild(pagecountHolder); break;
--- a/interfaces/horizontal-sliders.js Tue Feb 23 16:06:03 2016 +0000 +++ b/interfaces/horizontal-sliders.js Tue Feb 23 16:10:22 2016 +0000 @@ -150,7 +150,7 @@ pagecountHolder = document.createElement('div'); pagecountHolder.id = 'page-count'; } - pagecountHolder.innerHTML = '<span>Page '+(page.presentedId+1)+' of '+specification.pages.length+'</span>'; + pagecountHolder.innerHTML = '<span>Page '+(testState.stateIndex+1)+' of '+testState.stateMap.length+'</span>'; var inject = document.getElementById('interface-buttons'); inject.appendChild(pagecountHolder); break;
--- a/interfaces/mushra.js Tue Feb 23 16:06:03 2016 +0000 +++ b/interfaces/mushra.js Tue Feb 23 16:10:22 2016 +0000 @@ -149,7 +149,7 @@ pagecountHolder = document.createElement('div'); pagecountHolder.id = 'page-count'; } - pagecountHolder.innerHTML = '<span>Page '+(audioHolderObject.presentedId+1)+' of '+specification.pages.length+'</span>'; + pagecountHolder.innerHTML = '<span>Page '+(testState.stateIndex+1)+' of '+testState.stateMap.length+'</span>'; var inject = document.getElementById('interface-buttons'); inject.appendChild(pagecountHolder); break;