# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1456243822 0
# Node ID d5898c3ae2ba6de28cbd99c78684a847554abadb
# Parent  8d9b3e45b8f288c93d922464ac12b233763787a7
Bug #1629: Updated on page progress counter to reflect if using a subset.

diff -r 8d9b3e45b8f2 -r d5898c3ae2ba interfaces/AB.js
--- 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;
diff -r 8d9b3e45b8f2 -r d5898c3ae2ba interfaces/ape.js
--- 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') {
diff -r 8d9b3e45b8f2 -r d5898c3ae2ba interfaces/discrete.js
--- 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;
diff -r 8d9b3e45b8f2 -r d5898c3ae2ba interfaces/horizontal-sliders.js
--- 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;
diff -r 8d9b3e45b8f2 -r d5898c3ae2ba interfaces/mushra.js
--- 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;